From 5a6232ab7d401bc38ee8a976be816b0c9d76b737 Mon Sep 17 00:00:00 2001
From: lonnen <Chris.Lonnen@gmail.com>
Date: Wed, 8 Sep 2010 07:34:37 +0000
Subject: [PATCH] Minor bug fixes in new sketch template and perspective.

---
 .../Processing Plugin for Eclipse/feature.xml | 13 ++++--
 .../processing.plugin.ui/META-INF/MANIFEST.MF |  2 +-
 editor/processing.plugin.ui/plugin.xml        | 43 ++++++++++++++++---
 .../plugin/ui/perspective/Sketching.java      | 36 ++++------------
 editor/processing.plugin.updateSite/site.xml  |  2 +-
 5 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/editor/Processing Plugin for Eclipse/feature.xml b/editor/Processing Plugin for Eclipse/feature.xml
index ab5bf972f..cf0ba8c2d 100644
--- a/editor/Processing Plugin for Eclipse/feature.xml	
+++ b/editor/Processing Plugin for Eclipse/feature.xml	
@@ -2,7 +2,7 @@
 <feature
       id="processing.plugin"
       label="Processing Plug-In for Eclipse"
-      version="1.0.0.qualifier"
+      version="1.0.1.qualifier"
       provider-name="Processing.org">
 
    <description url="http://www.processing.org/">
@@ -33,14 +33,21 @@ All images are included under a creative commons license (http://creativecommons
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="processing.plugin.appBundle" version="1.2.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.jdt.launching"/>
+      <import plugin="org.eclipse.core.commands"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.filebuffers"/>
+      <import plugin="org.eclipse.jdt.debug.ui"/>
       <import plugin="org.eclipse.jface.text" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="processing.plugin.core" version="0.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.jdt.launching" version="3.5.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core" version="3.6.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/editor/processing.plugin.ui/META-INF/MANIFEST.MF b/editor/processing.plugin.ui/META-INF/MANIFEST.MF
index ce1279e3f..500bd76d7 100644
--- a/editor/processing.plugin.ui/META-INF/MANIFEST.MF
+++ b/editor/processing.plugin.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Processing Plugin User Interface Elements
 Bundle-SymbolicName: processing.plugin.ui;singleton:=true
-Bundle-Version: 0.1.0.1
+Bundle-Version: 0.1.3.1
 Bundle-Activator: processing.plugin.ui.ProcessingPlugin
 Bundle-Vendor: Processing.org
 Require-Bundle: org.eclipse.ui,
diff --git a/editor/processing.plugin.ui/plugin.xml b/editor/processing.plugin.ui/plugin.xml
index 41d80824a..52a2dc162 100644
--- a/editor/processing.plugin.ui/plugin.xml
+++ b/editor/processing.plugin.ui/plugin.xml
@@ -18,15 +18,17 @@
             extensions="pde">
       </participant>
    </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
+   <extension point="org.eclipse.ui.newWizards">
       <category
             id="processing.plugin.ui.wizards"
-            name="Processing">
+            name="Processing Wizards">
       </category>
       <wizard
-            category="org.processing.wizards"
+            category="processing.plugin.ui.wizards"
             class="processing.plugin.ui.wizards.NewSketchWizard"
+            descriptionImage="Resources/16x16_icon.gif"
+            finalPerspective="processing.plugin.ui.sketchingPerspective"
+            icon="Resources/16x16_icon.gif"
             id="processing.plugin.ui.wizards.NewSketchWizard"
             name="Processing Sketch"
             project="true">
@@ -51,7 +53,6 @@
          <description>
             Hides the generated folder and its contents from the UI.
          </description>
-            
       </filter>
    </extension>
    <extension point="org.eclipse.debug.ui.launchShortcuts">
@@ -63,6 +64,7 @@
             id="processing.plugin.ui.launching.runSketchAsApplet"
             label="Processing Sketch (Applet)"
             modes="run">
+            <perspective id="processing.plugin.ui.sketchingPerspective"/>
          <contextualLaunch>
             <enablement>
             	<with variable="selection">
@@ -90,6 +92,37 @@
          </description>
       </perspective>
    </extension>
+   <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="processing.plugin.ui.sketchingPerspective">
+         <newWizardShortcut
+               id="processing.plugin.ui.wizards.NewSketchWizard">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.ui.wizards.new.file">
+         </newWizardShortcut>
+         <newWizardShortcut
+               id="org.eclipse.ui.wizards.new.folder">
+         </newWizardShortcut>
+         <perspectiveShortcut
+               id="org.eclipse.jdt.ui.JavaPerspective">
+         </perspectiveShortcut>
+         <viewShortcut
+               id="org.eclipse.ui.navigator.ProjectExplorer">
+         </viewShortcut>
+         <showInPart></showInPart>
+         <viewShortcut
+               id="org.eclipse.ui.views.ProblemView">
+         </viewShortcut>
+         <viewShortcut
+               id="org.eclipse.ui.views.ResourceNavigator">
+         </viewShortcut>
+         <viewShortcut
+               id="org.eclipse.ui.console.ConsoleView">
+         </viewShortcut>
+      </perspectiveExtension>
+   </extension>
 
 
 
diff --git a/editor/processing.plugin.ui/src/processing/plugin/ui/perspective/Sketching.java b/editor/processing.plugin.ui/src/processing/plugin/ui/perspective/Sketching.java
index ead62a575..8b99d4f03 100644
--- a/editor/processing.plugin.ui/src/processing/plugin/ui/perspective/Sketching.java
+++ b/editor/processing.plugin.ui/src/processing/plugin/ui/perspective/Sketching.java
@@ -19,41 +19,23 @@ public class Sketching implements IPerspectiveFactory {
 
 	/* (non-JavaDoc) organization suggested by http://www.eclipse.org/articles/using-perspectives/PerspectiveArticle.html */
 	public void createInitialLayout(IPageLayout layout) {
-			defineMenuItemOptions(layout);
-			defineLayout(layout);
-	}
-	
-	/** Define what menu items */
-	public void defineMenuItemOptions(IPageLayout layout){
-		layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");
-		layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");
-		layout.addNewWizardShortcut("processing.plugin.ui.wizards.NewSketchWizard");
-		//TODO "processing.plugin.ui.wizards.NewTab" equivalent
-
-		// Add them to the Window -> Show view menu
-		layout.addShowViewShortcut(IPageLayout.ID_EDITOR_AREA);
-		layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-		layout.addShowViewShortcut("org.eclipse.ui.console.ConsoleView");
-		layout.addShowViewShortcut(IPageLayout.ID_PROJECT_EXPLORER);
-	}
-	
-	public void defineLayout(IPageLayout layout){
 		//Editors are in assumed to be in the center, so there is no placement info for them.
+		String editorAreaIdentifier = layout.getEditorArea();
+
+		// Left set of stuff
+		float leftPanelSizeAsRatio = 0.2f;
+		IFolderLayout leftPanels =
+			layout.createFolder("left", IPageLayout.LEFT, leftPanelSizeAsRatio, editorAreaIdentifier);
+		leftPanels.addView(IPageLayout.ID_RES_NAV);
 		
-		// Fast view of the file manager
-		float fastViewSizeAsRatio = 0.3f; // ratio of the screen this should overlay
-		layout.addFastView(IPageLayout.ID_PROJECT_EXPLORER, fastViewSizeAsRatio);
-		
-		// Bottom set of tabs.
+		// Bottom set of tabs
 		// strangely, this number is the screen ratio the bottom panel should *not* take up
 		// which is different than the fast view size as ratio
 		float bottomPanelSizeAsInverseRatio = 0.7f;
-		String editorAreaIdentifier = layout.getEditorArea();
 		IFolderLayout bottomPanels = 
 			layout.createFolder("bottom", IPageLayout.BOTTOM, bottomPanelSizeAsInverseRatio, editorAreaIdentifier);
 		bottomPanels.addView(IPageLayout.ID_PROBLEM_VIEW);
-		bottomPanels.addView("org.eclipse.ui.console.ConsoleView");
-	}
+		bottomPanels.addView("org.eclipse.ui.console.ConsoleView");	}
 	
 	/* //TODO Fix the toolbars
 	 * Frustratingly I cannot figure out much here. Toolbar contributions
diff --git a/editor/processing.plugin.updateSite/site.xml b/editor/processing.plugin.updateSite/site.xml
index f27c666f5..75ae7a81a 100644
--- a/editor/processing.plugin.updateSite/site.xml
+++ b/editor/processing.plugin.updateSite/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/processing.plugin_1.0.0.201009080129.jar" id="processing.plugin" version="1.0.0.201009080129">
+   <feature url="features/processing.plugin_1.0.1.201009080330.jar" id="processing.plugin" version="1.0.1.201009080330">
       <category name="processing_plug_in"/>
    </feature>
    <category-def name="processing_plug_in" label="Processing Plug-in for Eclipse">