From a78a0b16c704a85a5615b893d9845f390414700f Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sat, 22 Jan 2011 17:03:12 +0000
Subject: [PATCH] more of the moving

---
 app/src/processing/mode/java/JavaEditor.java  | 30 +++++++++----------
 .../java/{Toolbar.java => JavaToolbar.java}   |  6 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)
 rename app/src/processing/mode/java/{Toolbar.java => JavaToolbar.java} (94%)

diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
index 0c3b64079..3a3dedcc9 100644
--- a/app/src/processing/mode/java/JavaEditor.java
+++ b/app/src/processing/mode/java/JavaEditor.java
@@ -44,7 +44,7 @@ public class JavaEditor extends Editor {
 
   
   public EditorToolbar createToolbar() {
-    return new Toolbar(this, base);
+    return new JavaToolbar(this, base);
   }
   
   
@@ -120,7 +120,7 @@ public class JavaEditor extends Editor {
    */
   public void handleExportApplet() {
     if (handleExportCheckModified()) {
-      toolbar.activate(Toolbar.EXPORT);
+      toolbar.activate(JavaToolbar.EXPORT);
       try {
         boolean success = jmode.handleExportApplet(sketch);
         if (success) {
@@ -134,7 +134,7 @@ public class JavaEditor extends Editor {
       } catch (Exception e) {
         statusError(e);
       }
-      toolbar.deactivate(Toolbar.EXPORT);
+      toolbar.deactivate(JavaToolbar.EXPORT);
     }
   }
   
@@ -154,7 +154,7 @@ public class JavaEditor extends Editor {
    * Handler for Sketch &rarr; Export Application
    */
   public void handleExportApplication() {
-    toolbar.activate(Toolbar.EXPORT);
+    toolbar.activate(JavaToolbar.EXPORT);
     
     if (handleExportCheckModified()) {
       statusNotice("Exporting application...");
@@ -171,7 +171,7 @@ public class JavaEditor extends Editor {
         e.printStackTrace();
       }
     }
-    toolbar.deactivate(Toolbar.EXPORT);
+    toolbar.deactivate(JavaToolbar.EXPORT);
   }
   
   
@@ -396,7 +396,7 @@ public class JavaEditor extends Editor {
 
   protected void prepareRun() {
     internalCloseRunner();
-    toolbar.activate(Toolbar.RUN);
+    toolbar.activate(JavaToolbar.RUN);
     statusEmpty();
 
     // do this to advance/clear the terminal window / dos prompt / etc
@@ -430,7 +430,7 @@ public class JavaEditor extends Editor {
   
   
   public void handleStop() {
-    toolbar.activate(Toolbar.STOP);
+    toolbar.activate(JavaToolbar.STOP);
 
     try {
       jmode.handleStop();
@@ -438,8 +438,8 @@ public class JavaEditor extends Editor {
       statusError(e);
     }
 
-    toolbar.deactivate(Toolbar.RUN);
-    toolbar.deactivate(Toolbar.STOP);
+    toolbar.deactivate(JavaToolbar.RUN);
+    toolbar.deactivate(JavaToolbar.STOP);
 
     // focus the PDE again after quitting presentation mode [toxi 030903]
     toFront();
@@ -447,18 +447,18 @@ public class JavaEditor extends Editor {
   
   
   public void handleSave() {
-    toolbar.activate(Toolbar.SAVE);
+    toolbar.activate(JavaToolbar.SAVE);
     handleStop();
     super.handleSave();
-    toolbar.deactivate(Toolbar.SAVE);
+    toolbar.deactivate(JavaToolbar.SAVE);
   }
   
   
   public boolean handleSaveAs() {
-    toolbar.activate(Toolbar.SAVE);
+    toolbar.activate(JavaToolbar.SAVE);
     handleStop();
     boolean result = super.handleSaveAs();
-    toolbar.deactivate(Toolbar.SAVE);
+    toolbar.deactivate(JavaToolbar.SAVE);
     return result;
   }
   
@@ -503,12 +503,12 @@ public class JavaEditor extends Editor {
    * To initiate a "stop" action, call handleStop() instead.
    */
   public void deactivateRun() {
-    toolbar.deactivate(Toolbar.RUN);
+    toolbar.deactivate(JavaToolbar.RUN);
   }
 
 
   public void deactivateExport() {
-    toolbar.deactivate(Toolbar.EXPORT);
+    toolbar.deactivate(JavaToolbar.EXPORT);
   }
   
   
diff --git a/app/src/processing/mode/java/Toolbar.java b/app/src/processing/mode/java/JavaToolbar.java
similarity index 94%
rename from app/src/processing/mode/java/Toolbar.java
rename to app/src/processing/mode/java/JavaToolbar.java
index 60350e03c..0db68b9a6 100644
--- a/app/src/processing/mode/java/Toolbar.java
+++ b/app/src/processing/mode/java/JavaToolbar.java
@@ -1,7 +1,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2010 Ben Fry and Casey Reas
+  Copyright (c) 2010-11 Ben Fry and Casey Reas
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2
@@ -29,7 +29,7 @@ import processing.app.Editor;
 import processing.app.EditorToolbar;
 
 
-public class Toolbar extends EditorToolbar {
+public class JavaToolbar extends EditorToolbar {
   /** Rollover titles for each button. */
   static final String title[] = {
     "Run", "Stop", "New", "Open", "Save", "Export"
@@ -52,7 +52,7 @@ public class Toolbar extends EditorToolbar {
 //  JMenu menu;
 
   
-  public Toolbar(Editor editor, Base base) {
+  public JavaToolbar(Editor editor, Base base) {
     super(editor, base);
     
     Image[][] images = loadImages();