svn commit: r798647 - in /felix/trunk/sigil/eclipse/ui: plugin.xml src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java

[ds...@apache.org]

Author: dsavage
Date: Tue Jul 28 18:49:00 2009
New Revision: 798647

URL: http://svn.apache.org/viewvc?rev=798647&view=rev
Log:
tidy up old cauldron references

Modified:
    felix/trunk/sigil/eclipse/ui/plugin.xml
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java

Modified: felix/trunk/sigil/eclipse/ui/plugin.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/plugin.xml?rev=798647&r1=798646&r2=798647&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/plugin.xml (original)
+++ felix/trunk/sigil/eclipse/ui/plugin.xml Tue Jul 28 18:49:00 2009
@@ -72,7 +72,7 @@
             category="org.apache.felix.sigil.ui.preferences.SigilPreferencePage"
             class="org.apache.felix.sigil.ui.eclipse.ui.preferences.installs.OSGiInstallsPreferencePage"
             id="org.apache.felix.sigil.ui.preferences.osgiInstalls"
-            name="Newton Installs">
+            name="OSGi Installs">
       </page>
    </extension>
    <extension

Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java?rev=798647&r1=798646&r2=798647&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/SigilUI.java Tue Jul 28 18:49:00 2009
@@ -34,7 +34,6 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -53,9 +52,8 @@
     public static final String PREF_NOPROMPT_INSTALL_COMPOSITE_WITH_ERRORS = "nopromptInstallCompositeError";
     public static final String PREF_INSTALL_COMPOSITE_WITH_ERRORS_ANSWER = "answerInstallCompositeError";
 
-    public static final String ID_REPOSITORY_VIEW = "org.cauldron.sigil.ui.repositoryBrowser";
-    public static final String ID_DEPENDENCY_VIEW = "org.cauldron.sigil.ui.bundleDependencyView";
-    public static final String ID_INSTANCES_VIEW = "org.cauldron.sigil.runtime.newtonInstancesView";
+    public static final String ID_REPOSITORY_VIEW = "org.apache.felix.sigil.ui.repositoryBrowser";
+    public static final String ID_DEPENDENCY_VIEW = "org.apache.felix.sigil.ui.bundleDependencyView";
 
     // The shared instance
     private static SigilUI plugin;

Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java?rev=798647&r1=798646&r2=798647&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/ui/eclipse/ui/perspective/SigilPerspectiveFactory.java Tue Jul 28 18:49:00 2009
@@ -35,8 +35,6 @@
     private static final String ID_PROJECT_EXPLORER = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
     private static final String ID_SEARCH_VIEW = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$
     private static final String ID_CONSOLE_VIEW = "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$
-    private static final String ID_TEMPLATES_VIEW = "org.eclipse.ui.texteditor.TemplatesView"; //$NON-NLS-N$
-
 
     public void createInitialLayout( IPageLayout layout )
     {
@@ -62,7 +60,6 @@
         outputfolder.addPlaceholder( IPageLayout.ID_BOOKMARKS );
         outputfolder.addPlaceholder( IProgressConstants.PROGRESS_VIEW_ID );
         outputfolder.addPlaceholder( SigilUI.ID_DEPENDENCY_VIEW );
-        outputfolder.addPlaceholder( SigilUI.ID_INSTANCES_VIEW );
 
         layout.addActionSet( IDebugUIConstants.LAUNCH_ACTION_SET );
         layout.addActionSet( JavaUI.ID_ACTION_SET );
@@ -72,7 +69,6 @@
         // views - sigil
         layout.addShowViewShortcut( SigilUI.ID_REPOSITORY_VIEW );
         layout.addShowViewShortcut( SigilUI.ID_DEPENDENCY_VIEW );
-        layout.addShowViewShortcut( SigilUI.ID_INSTANCES_VIEW );
 
         // views - java
         layout.addShowViewShortcut( JavaUI.ID_PACKAGES );