From 5037980c2efe8d377f103a5e590a9023cae88bd3 Mon Sep 17 00:00:00 2001
From: lonnen <Chris.Lonnen@gmail.com>
Date: Wed, 8 Sep 2010 20:29:59 +0000
Subject: [PATCH] Implemented a resource navigator that hides generated files
 and non-processing projects, both with the option to disable. This let me
 remove the single line of depreciated code in the editor perspective. Also,
 run sketch is enabled in the context menu for skech files/projects in the
 navigator. Included a full feature build for the update site.

---
 .../Processing Plugin for Eclipse/feature.xml |   2 +-
 .../processing.plugin.ui/META-INF/MANIFEST.MF |   6 +-
 editor/processing.plugin.ui/plugin.xml        | 120 +++++++++++-------
 .../plugin/ui/perspective/Sketching.java      |  10 +-
 editor/processing.plugin.updateSite/site.xml  |   2 +-
 5 files changed, 83 insertions(+), 57 deletions(-)

diff --git a/editor/Processing Plugin for Eclipse/feature.xml b/editor/Processing Plugin for Eclipse/feature.xml
index cf0ba8c2d..4d1bdb42f 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.1.qualifier"
+      version="1.0.2.qualifier"
       provider-name="Processing.org">
 
    <description url="http://www.processing.org/">
diff --git a/editor/processing.plugin.ui/META-INF/MANIFEST.MF b/editor/processing.plugin.ui/META-INF/MANIFEST.MF
index 500bd76d7..d33ea31aa 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.3.1
+Bundle-Version: 0.1.4.1
 Bundle-Activator: processing.plugin.ui.ProcessingPlugin
 Bundle-Vendor: Processing.org
 Require-Bundle: org.eclipse.ui,
@@ -16,7 +16,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.debug.ui,
  org.eclipse.jdt.launching;bundle-version="3.5.100",
  org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.jdt.core;bundle-version="3.6.0"
+ org.eclipse.jdt.core;bundle-version="3.6.0",
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.navigator.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui.actions
diff --git a/editor/processing.plugin.ui/plugin.xml b/editor/processing.plugin.ui/plugin.xml
index 52a2dc162..ff71b3bdd 100644
--- a/editor/processing.plugin.ui/plugin.xml
+++ b/editor/processing.plugin.ui/plugin.xml
@@ -42,19 +42,6 @@
             name="Processing">
       </page>
    </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-   </extension>
-   <extension
-         point="org.eclipse.ui.ide.resourceFilters">
-      <filter
-      		pattern = "generated"
-            selected="true">
-         <description>
-            Hides the generated folder and its contents from the UI.
-         </description>
-      </filter>
-   </extension>
    <extension point="org.eclipse.debug.ui.launchShortcuts">
       <shortcut
             category="Processing"
@@ -64,7 +51,6 @@
             id="processing.plugin.ui.launching.runSketchAsApplet"
             label="Processing Sketch (Applet)"
             modes="run">
-            <perspective id="processing.plugin.ui.sketchingPerspective"/>
          <contextualLaunch>
             <enablement>
             	<with variable="selection">
@@ -80,8 +66,7 @@
          </contextualLaunch>
       </shortcut>
    </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
+   <extension point="org.eclipse.ui.perspectives">
       <perspective
             class="processing.plugin.ui.perspective.Sketching"
             icon="Resources/16x16_icon.gif"
@@ -92,39 +77,78 @@
          </description>
       </perspective>
    </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
+   <extension point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension targetID="processing.plugin.ui.sketchingPerspective">
+         <newWizardShortcut id="processing.plugin.ui.wizards.NewSketchWizard" />
+         <newWizardShortcut id="org.eclipse.ui.wizards.new.file" />
+         <newWizardShortcut id="org.eclipse.ui.wizards.new.folder" />
+         <perspectiveShortcut id="org.eclipse.jdt.ui.JavaPerspective" />
+         <viewShortcut id="org.eclipse.ui.navigator.ProjectExplorer" />
+         <viewShortcut id="org.eclipse.ui.views.ProblemView" />
+         <viewShortcut id="org.eclipse.ui.views.ResourceNavigator" />
+         <viewShortcut id="org.eclipse.ui.console.ConsoleView" />
+      </perspectiveExtension>
       <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>
+            targetID="org.eclipse.ui.resourcePerspective">
+         <view
+               id="processing.plugin.ui.views.sketchView"
+               ratio="0.2"
+               relationship="stack"
+               relative="org.eclipse.ui.navigator.ProjectExplorer">
+         </view>
       </perspectiveExtension>
    </extension>
-
-
-
-
+   <extension point="org.eclipse.ui.views">
+      <view
+            class="org.eclipse.ui.navigator.CommonNavigator"
+            icon="Resources/16x16_icon.gif"
+            id="processing.plugin.ui.views.sketchView"
+            name="Sketch Navigator">
+      </view>
+   </extension>
+   <extension point="org.eclipse.ui.navigator.viewer">
+      <viewerActionBinding
+            viewerId="processing.plugin.ui.views.sketchView">
+         <includes>
+            <actionExtension pattern="org.eclipse.ui.navigator.resources.*" />
+         </includes>
+      </viewerActionBinding>
+      <viewerContentBinding viewerId="processing.plugin.ui.views.sketchView">
+         <includes>
+            <contentExtension pattern="org.eclipse.ui.navigator.resourceContent" />
+            <contentExtension pattern="org.eclipse.ui.navigator.resources.filters.*" />
+            <contentExtension pattern="org.eclipse.ui.navigator.resources.linkHelper" />
+            <contentExtension pattern="org.eclipse.ui.navigator.resources.workingSets" />
+            <contentExtension pattern="processing.plugin.ui.filters.excludeGenerated" />
+            <contentExtension pattern="processing.plugin.ui.filters.excludeNonSketches" />
+         </includes>
+      </viewerContentBinding>
+   </extension>
+   <extension point="org.eclipse.ui.navigator.navigatorContent">
+      <commonFilter
+            activeByDefault="true"
+            description="Exclude derived resources generated during the Sketch building process."
+            id="processing.plugin.ui.filters.excludeGenerated"
+            name="Generated Folder"
+            visibleInUI="true">
+          <filterExpression>
+          	<test property="org.eclipse.core.resources.name" value="generated" />      
+          </filterExpression>
+      </commonFilter>
+      <commonFilter
+            activeByDefault="true"
+            description="Hides projects that are not Processing Sketches"
+            id="processing.plugin.ui.filters.excludeNonSketches"
+            name="Non-Sketch Projects"
+            visibleInUI="true">
+         <filterExpression>
+              <instanceof value="org.eclipse.core.resources.IProject" />
+              <and>
+    		    <not>
+       		      <test args="processing.plugin.core.sketchNature" property="org.eclipse.jdt.launching.hasProjectNature" />
+		        </not>
+		      </and>
+         </filterExpression>
+      </commonFilter>
+   </extension>
 </plugin>
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 8b99d4f03..18c8f84d9 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
@@ -26,8 +26,9 @@ public class Sketching implements IPerspectiveFactory {
 		float leftPanelSizeAsRatio = 0.2f;
 		IFolderLayout leftPanels =
 			layout.createFolder("left", IPageLayout.LEFT, leftPanelSizeAsRatio, editorAreaIdentifier);
-		leftPanels.addView(IPageLayout.ID_RES_NAV);
-		
+
+		leftPanels.addView("processing.plugin.ui.views.sketchView");
+			
 		// 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
@@ -55,10 +56,9 @@ public class Sketching implements IPerspectiveFactory {
 	 * the PDE toolbars are -- run, stop?, new, open, save, export  
 	 * 
 	 * For now, the Java perspective may actually be a better way for
-	 * people to interact with the sketch. Don't force this on anyone 
-	 * until it is better developed.
+	 * people to interact with the sketch.
 	 * 
-	 * @see Bug 36968 -  "[Contributions] Improve action contributions "
+	 * @see Eclipse Bug 36968 -  "[Contributions] Improve action contributions "
 	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=36968   
 	 */
 
diff --git a/editor/processing.plugin.updateSite/site.xml b/editor/processing.plugin.updateSite/site.xml
index 75ae7a81a..fd41602ef 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.1.201009080330.jar" id="processing.plugin" version="1.0.1.201009080330">
+   <feature url="features/processing.plugin_1.0.2.201009081624.jar" id="processing.plugin" version="1.0.2.201009081624">
       <category name="processing_plug_in"/>
    </feature>
    <category-def name="processing_plug_in" label="Processing Plug-in for Eclipse">