[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2843] trunk/com.aptana.rdt

[<caw...@us...>]

Revision: 2843
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=2843&view=rev
Author:   cawilliams
Date:     2007-07-25 10:27:57 -0700 (Wed, 25 Jul 2007)

Log Message:
-----------
break out UI related items into new com.aptana.rdt.ui plugin

Modified Paths:
--------------
    trunk/com.aptana.rdt/META-INF/MANIFEST.MF
    trunk/com.aptana.rdt/plugin.xml
    trunk/com.aptana.rdt/src/com/aptana/rdt/AptanaRDTPlugin.java
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java

Added Paths:
-----------
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.java
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.properties

Removed Paths:
-------------
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/RubyGemsInitializer.java
    trunk/com.aptana.rdt/src/com/aptana/rdt/ui/PreferenceConstants.java

Modified: trunk/com.aptana.rdt/META-INF/MANIFEST.MF
===================================================================
--- trunk/com.aptana.rdt/META-INF/MANIFEST.MF	2007-07-25 17:06:41 UTC (rev 2842)
+++ trunk/com.aptana.rdt/META-INF/MANIFEST.MF	2007-07-25 17:27:57 UTC (rev 2843)
@@ -9,18 +9,14 @@
 Bundle-Vendor: Aptana, Inc.
 Export-Package: com.aptana.rdt,
  com.aptana.rdt.core.gems,
- com.aptana.rdt.launching,
  com.aptana.rdt.internal.core.gems;x-friends:="com.aptana.rdt.tests",
  com.aptana.rdt.internal.parser.warnings,
- com.aptana.rdt.internal.ui.preferences
+ com.aptana.rdt.launching
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.intro,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  org.jruby,
  org.rubypeople.rdt.core,
- org.rubypeople.rdt.launching,
- org.rubypeople.rdt.ui
+ org.rubypeople.rdt.launching

Modified: trunk/com.aptana.rdt/plugin.xml
===================================================================
--- trunk/com.aptana.rdt/plugin.xml	2007-07-25 17:06:41 UTC (rev 2842)
+++ trunk/com.aptana.rdt/plugin.xml	2007-07-25 17:27:57 UTC (rev 2843)
@@ -1,69 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
 <plugin>
-    
-   <extension point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension targetID="org.rubypeople.rdt.ui.RubyBrowsingPerspective">
-         <perspectiveShortcut id="org.radrails.rails.ui.PerspectiveRails"/>
-      </perspectiveExtension>
-      <perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective">
-         <perspectiveShortcut id="org.radrails.rails.ui.PerspectiveRails"/>
-      </perspectiveExtension>
-   	 <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
-       <perspectiveShortcut id="org.radrails.rails.ui.PerspectiveRails" />
-     </perspectiveExtension>
-     <perspectiveExtension targetID="org.rubypeople.rdt.ui.PerspectiveRuby">
-       <perspectiveShortcut id="org.radrails.rails.ui.PerspectiveRails" />
-     </perspectiveExtension>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.views">
-         <view
-            name="Rails API"
-            icon="icons/full/elcl16/rails.gif"
-            category="org.radrails.rails.ui.ViewCategoryRails"
-            class="com.aptana.rdt.internal.ui.infoviews.RailsAPIView"
-            id="com.aptana.rdt.ui.views.RailsAPIView">
-      </view>
-      <view
-            name="Ruby Core API"
-            icon="icons/full/elcl16/rubydoc.gif"
-            category="org.rubypeople.rdt.ui.ruby"
-            class="com.aptana.rdt.internal.ui.infoviews.RubyCoreAPIView"
-            id="com.aptana.rdt.ui.views.RubyCoreAPIView">
-      </view>
-      <view
-            name="Ruby Standard Library API"
-            icon="icons/full/elcl16/rubydoc.gif"
-            category="org.rubypeople.rdt.ui.ruby"
-            class="com.aptana.rdt.internal.ui.infoviews.RubyStdLibAPIView"
-            id="com.aptana.rdt.ui.views.RubyStdLibAPIView">
-      </view>
-      <view
-            category="org.rubypeople.rdt.ui.ruby"
-            class="com.aptana.rdt.ui.gems.GemsView"
-            icon="icons/rubygems.png"
-            id="com.aptana.gems.ui.ViewGems"
-            name="RubyGems"/>
-  </extension>
-  
-  <extension point="org.eclipse.ui.perspectiveExtensions">
-     <perspectiveExtension targetID="org.rubypeople.rdt.ui.PerspectiveRuby">
-       <viewShortcut id="com.aptana.rdt.ui.views.RubyStdLibAPIView"/>   
-       <viewShortcut id="com.aptana.rdt.ui.views.RubyCoreAPIView"/> 
-     </perspectiveExtension> 
-   </extension>
-   
-   <extension
-         point="org.rubypeople.rdt.ui.quickFixProcessors">
-      <quickFixProcessor
-            name="%defaultQuickFixProcessor"
-            class="com.aptana.rdt.internal.ui.text.correction.QuickFixProcessor"
-            id="com.aptana.rdt.ui.text.correction.QuickFixProcessor">
-      </quickFixProcessor>
-   </extension>
-	<extension
+   	<extension
       id="rubyredlint"
       name="%annotationProcessingName"
       point="org.rubypeople.rdt.core.compilationParticipant">
@@ -139,56 +77,6 @@
        			<argument prefKey="com.aptana.rdt.compiler.problem.maxReturns"/>
        	</error>		
  </extension>
-   
-   <extension
-         point="org.eclipse.ui.viewActions">
-      <viewContribution
-            id="com.aptana.gems.ui.ViewActions"
-            targetID="com.aptana.gems.ui.ViewGems">
-         <action
-               class="com.aptana.rdt.internal.ui.actions.InstallGemActionDelegate"
-               icon="icons/add.gif"
-               id="com.aptana.gems.ui.ActionInstallGem"
-               label="Install"
-               style="push"
-               toolbarPath="additions"
-               tooltip="Install"/>
-         <action
-               class="com.aptana.rdt.internal.ui.actions.RemoveGemActionDelegate"
-               icon="icons/remove.gif"
-               id="com.aptana.gems.ui.ActionRemoveGem"
-               label="Remove"
-               style="push"
-               toolbarPath="additions"
-               enablesFor="1"
-               tooltip="Remove"/>
-         <action
-               class="com.aptana.rdt.internal.ui.actions.RefreshGemsActionDelegate"
-               icon="icons/nav_refresh.gif"
-               id="com.aptana.gems.ui.ActionRefreshGems"
-               label="Refresh"
-               style="push"
-               toolbarPath="additions"
-               tooltip="Refresh"/>
-         <action
-               class="com.aptana.rdt.internal.ui.actions.UpdateGemActionDelegate"
-               icon="icons/ruby_get.png"
-               id="com.aptana.gems.ui.ActionUpdateGem"
-               label="Update Gem"
-               style="push"
-               enablesFor="1"
-               toolbarPath="additions"
-               tooltip="Update Gem"/>
-         <action
-               class="com.aptana.rdt.internal.ui.actions.UpdateAllActionDelegate"
-               icon="icons/upgrade.gif"
-               id="com.aptana.gems.ui.ActionUpdateAllGems"
-               label="Update All Gems"
-               style="push"
-               toolbarPath="additions"
-               tooltip="Update All Gems"/>
-      </viewContribution>
-   </extension>
  
 <!-- =================================================================================== -->
 <!-- Extension: Eclipse preferences initializer                                          -->
@@ -197,11 +85,6 @@
       point="org.eclipse.core.runtime.preferences">
    <initializer class="com.aptana.rdt.internal.core.RubyRedPreferenceInitializer"/>
 </extension>
-
-  <extension
-         point="org.eclipse.ui.startup">
-      <startup class="com.aptana.rdt.internal.core.gems.RubyGemsInitializer"/>
-   </extension>
    
    <extension
          point="org.rubypeople.rdt.core.loadpathVariableInitializer">

Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/AptanaRDTPlugin.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/AptanaRDTPlugin.java	2007-07-25 17:06:41 UTC (rev 2842)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/AptanaRDTPlugin.java	2007-07-25 17:27:57 UTC (rev 2843)
@@ -12,18 +12,16 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IPreferencesService;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 import org.rubypeople.rdt.internal.core.RubyModelManager.EclipsePreferencesListener;
 import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
-import org.rubypeople.rdt.internal.ui.IRubyStatusConstants;
 
 import com.aptana.rdt.core.gems.Gem;
 import com.aptana.rdt.core.gems.GemListener;
@@ -34,7 +32,7 @@
 /**
  * The activator class controls the plug-in life cycle
  */
-public class AptanaRDTPlugin extends AbstractUIPlugin {
+public class AptanaRDTPlugin extends Plugin {
 
 	// The plug-in ID
 	public static final String PLUGIN_ID = "com.aptana.rdt";
@@ -328,17 +326,6 @@
 	public static AptanaRDTPlugin getDefault() {
 		return plugin;
 	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
 	
 	public static File getFileInPlugin(IPath path) {
 		try {
@@ -352,7 +339,7 @@
 	}
 
 	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getPluginId(), IRubyStatusConstants.INTERNAL_ERROR, RubyRedMessages.RubyRedPlugin_internal_error, e)); 
+		log(new Status(IStatus.ERROR, getPluginId(), -1, RubyRedMessages.RubyRedPlugin_internal_error, e)); 
 	}
 	
 	public static void log(IStatus status) {

Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-07-25 17:06:41 UTC (rev 2842)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemManager.java	2007-07-25 17:27:57 UTC (rev 2843)
@@ -44,8 +44,6 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.widgets.Display;
 import org.rubypeople.rdt.launching.IRubyLaunchConfigurationConstants;
 import org.rubypeople.rdt.launching.IVMInstall;
 import org.rubypeople.rdt.launching.RubyRuntime;
@@ -57,8 +55,6 @@
 import com.aptana.rdt.core.gems.Gem;
 import com.aptana.rdt.core.gems.GemListener;
 import com.aptana.rdt.core.gems.IGemManager;
-import com.aptana.rdt.ui.gems.GemsMessages;
-import com.aptana.rdt.ui.gems.RemoveGemDialog;
 
 public class GemManager implements IGemManager {
 
@@ -438,14 +434,7 @@
 	 * @see com.aptana.rdt.internal.gems.IGemManager#removeGem(com.aptana.rdt.internal.gems.Gem)
 	 */
 	public boolean removeGem(final Gem gem) {
-		if (gem.hasMultipleVersions()) {
-			RemoveGemDialog dialog = new RemoveGemDialog(Display.getDefault().getActiveShell(), gem.versions());
-			if (dialog.open() == Dialog.OK) {
-				return removeGem(new Gem(gem.getName(), dialog.getVersion(), null));
-			} else {
-				return false;
-			}
-		}
+		if (gem.hasMultipleVersions()) return false;
 		try {
 			String command = UNINSTALL_COMMAND + " " + gem.getName();			
 			if (gem.getVersion() != null

Added: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.java	                        (rev 0)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.java	2007-07-25 17:27:57 UTC (rev 2843)
@@ -0,0 +1,15 @@
+package com.aptana.rdt.internal.core.gems;
+
+import org.eclipse.osgi.util.NLS;
+
+public class GemsMessages extends NLS {
+
+	private static final String BUNDLE_NAME = GemsMessages.class.getName();
+	
+	public static String GemManager_loading_local_gems;
+	public static String GemManager_loading_remote_gems;
+	
+	static {
+		NLS.initializeMessages(BUNDLE_NAME, GemsMessages.class);
+	}
+}


Property changes on: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.properties
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.properties	                        (rev 0)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.properties	2007-07-25 17:27:57 UTC (rev 2843)
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2007 Aptana, Inc.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html. If redistributing this code,
+# this entire header must remain intact.
+###############################################################################
+# contains externalized strings for com.aptana.rdt.internal.core.gems
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+GemManager_loading_local_gems=Loading local gem information
+GemManager_loading_remote_gems=Loading remote gem information


Property changes on: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/GemsMessages.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/RubyGemsInitializer.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/RubyGemsInitializer.java	2007-07-25 17:06:41 UTC (rev 2842)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/core/gems/RubyGemsInitializer.java	2007-07-25 17:27:57 UTC (rev 2843)
@@ -1,11 +0,0 @@
-package com.aptana.rdt.internal.core.gems;
-
-import org.eclipse.ui.IStartup;
-
-public class RubyGemsInitializer implements IStartup {
-
-	public void earlyStartup() {
-		GemManager.getInstance().initialize();
-	}
-
-}

Deleted: trunk/com.aptana.rdt/src/com/aptana/rdt/ui/PreferenceConstants.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/ui/PreferenceConstants.java	2007-07-25 17:06:41 UTC (rev 2842)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/ui/PreferenceConstants.java	2007-07-25 17:27:57 UTC (rev 2843)
@@ -1,7 +0,0 @@
-package com.aptana.rdt.ui;
-
-public class PreferenceConstants {
-	public static final String LICENSE_COMPANY_NAME = "licenseCompanyName";  //$NON-NLS-1$
-	public static final String LICENSE_EMAIL = "licenseEmail";   //$NON-NLS-1$
-	public static final String LICENSE_KEY = "licenseKey";   //$NON-NLS-1$
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.