You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2011/08/07 19:09:39 UTC
svn commit: r1154727 - in /oodt/trunk/app/weditor/src/main: java/org/apache/oodt/cas/workflow/gui/ java/org/apache/oodt/cas/workflow/gui/menu/ java/org/apache/oodt/cas/workflow/gui/util/ resources/icons/

Author: mattmann
Date: Sun Aug  7 17:09:38 2011
New Revision: 1154727

URL: http://svn.apache.org/viewvc?rev=1154727&view=rev
Log:
- wrap up OODT-296: Workflow Editor GUI: 
  - add in my own icons -- please improve
  - add Exit option to the File menu
  - remove create icons (not used)
  

Removed:
    oodt/trunk/app/weditor/src/main/resources/icons/create-sel.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/create.jpg
Modified:
    oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java
    oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/menu/FileMenu.java
    oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/util/IconLoader.java
    oodt/trunk/app/weditor/src/main/resources/icons/cursor-zoom.png
    oodt/trunk/app/weditor/src/main/resources/icons/delete-sel.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/delete.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/edit-sel.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/edit.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/move-sel.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/move.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/zoom-in-sel.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/zoom-in.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/zoom-out-sel.jpg
    oodt/trunk/app/weditor/src/main/resources/icons/zoom-out.jpg

Modified: oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
--- oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java (original)
+++ oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/WorkflowGUI.java Sun Aug  7 17:09:38 2011
@@ -191,6 +191,14 @@ public class WorkflowGUI extends JFrame 
     JMenuBar bar = new JMenuBar();
     FileMenu fileMenu = new FileMenu();
     bar.add(fileMenu);
+    fileMenu.getExit().addActionListener(new ActionListener() {
+      
+      @Override
+      public void actionPerformed(ActionEvent event) {
+        System.exit(1);        
+      }
+    });
+    
     fileMenu.getOpenWorkspace().addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent event) {
         try {

Modified: oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/menu/FileMenu.java
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/menu/FileMenu.java?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
--- oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/menu/FileMenu.java (original)
+++ oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/menu/FileMenu.java Sun Aug  7 17:09:38 2011
@@ -39,6 +39,7 @@ public class FileMenu extends JMenu {
   private JMenuItem openWorkspace;
   private JMenuItem importItem;
   private JMenuItem saveItem;
+  private JMenuItem exitItem;
   private JMenu newMenu, openMenu, importMenu;
 
   public FileMenu() {
@@ -51,6 +52,7 @@ public class FileMenu extends JMenu {
     this.add(importMenu = new JMenu("Import"));
     importMenu.add(this.importItem = new JMenuItem("Project"));
     this.add(this.saveItem = new JMenuItem("Save Project"));
+    this.add(this.exitItem = new JMenuItem("Exit"));
   }
 
   public JMenuItem getOpenWorkspace() {
@@ -72,5 +74,9 @@ public class FileMenu extends JMenu {
   public JMenuItem getSave() {
     return this.saveItem;
   }
+  
+  public JMenuItem getExit(){
+    return this.exitItem;
+  }
 
 }

Modified: oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/util/IconLoader.java
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/util/IconLoader.java?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
--- oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/util/IconLoader.java (original)
+++ oodt/trunk/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/util/IconLoader.java Sun Aug  7 17:09:38 2011
@@ -53,10 +53,6 @@ public class IconLoader {
 
   public static Image getIcon(int icon) throws IOException {
     switch (icon) {
-    case CREATE:
-      return ImageIO.read(IconLoader.class.getResource("create.jpg"));
-    case CREATE_SELECTED:
-      return ImageIO.read(IconLoader.class.getResource("create-sel.jpg"));
     case DELETE:
       return ImageIO.read(IconLoader.class.getResource("delete.jpg"));
     case DELETE_SELECTED:

Modified: oodt/trunk/app/weditor/src/main/resources/icons/cursor-zoom.png
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/cursor-zoom.png?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/delete-sel.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/delete-sel.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/delete.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/delete.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/edit-sel.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/edit-sel.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/edit.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/edit.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/move-sel.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/move-sel.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/move.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/move.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/zoom-in-sel.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/zoom-in-sel.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/zoom-in.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/zoom-in.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/zoom-out-sel.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/zoom-out-sel.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.

Modified: oodt/trunk/app/weditor/src/main/resources/icons/zoom-out.jpg
URL: http://svn.apache.org/viewvc/oodt/trunk/app/weditor/src/main/resources/icons/zoom-out.jpg?rev=1154727&r1=1154726&r2=1154727&view=diff
==============================================================================
Binary files - no diff available.