• Views
  • Iteration Report
  • My Iteration Report
  •  
OMERO.clients
  • Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Changeset
  • Next Changeset →

Changeset 5567

Show
Ignore:
Timestamp:
08/20/08 17:13:52 (3 months ago)
Author:
jburel
Message:

Creation of an Editor Agent. so that Will can start merging is code

Location:
trunk
Files:
24 added
7 modified

  • SRC/org/openmicroscopy/shoola/agents/editor (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/EditorAgent.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/EditorLoader.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/FileLoader.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/IconManager.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/actions (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/actions/ActivationAction.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/actions/CreateAction.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/actions/EditorAction.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/graphx (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/graphx/nuvola_messagebox_info16.png (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/Editor.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/EditorComponent.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/EditorControl.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/EditorFactory.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/EditorModel.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/EditorStatusBar.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/EditorToolBar.java (added)
  • SRC/org/openmicroscopy/shoola/agents/editor/view/EditorUI.java (added)
  • SRC/org/openmicroscopy/shoola/agents/events/editor (added)
  • SRC/org/openmicroscopy/shoola/agents/events/editor/EditFileEvent.java (added)
  • SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerControl.java (modified) (2 diffs)
  • SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerFactory.java (modified) (4 diffs)
  • SRC/org/openmicroscopy/shoola/agents/treeviewer/TagSetsLoader.java (modified) (1 diff)
  • SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (2 diffs)
  • SRC/org/openmicroscopy/shoola/env/data/views/MetadataHandlerView.java (modified) (1 diff)
  • SRC/org/openmicroscopy/shoola/env/ui/TaskBarView.java (modified) (2 diffs)
  • SRC/org/openmicroscopy/shoola/util/filter/file/EditorFileFilter.java (added)
  • config/container.xml (modified) (1 diff)
  • config/editor.xml (added)

Legend:

Unmodified
Added
Removed

  • trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerControl.java

    r5528 r5567  
    493493        private void createWindowsMenuItems(JMenu menu) 
    494494        { 
     495                ImViewerFactory.register(menu); 
     496                /* 
    495497                Set viewers = ImViewerFactory.getViewers(); 
    496498                Iterator i = viewers.iterator(); 
    … …  
    498500                while (i.hasNext())  
    499501                        menu.add(new JMenuItem(new ActivationAction((ImViewer) i.next()))); 
     502                        */ 
    500503        } 
    501504 

  • trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerFactory.java

    r5368 r5567  
    3636import java.util.Set; 
    3737import javax.swing.JMenu; 
     38import javax.swing.JMenuItem; 
    3839import javax.swing.event.ChangeEvent; 
    3940import javax.swing.event.ChangeListener; 
    … …  
    4546import org.openmicroscopy.shoola.agents.events.iviewer.SaveRelatedData; 
    4647import org.openmicroscopy.shoola.agents.imviewer.ImViewerAgent; 
     48import org.openmicroscopy.shoola.agents.imviewer.actions.ActivationAction; 
    4749import org.openmicroscopy.shoola.env.data.events.SaveEventRequest; 
    4850import org.openmicroscopy.shoola.env.rnd.RndProxyDef; 
    … …  
    8284 
    8385        /**  
    84          * Returns all the {@link ImViewer} components that this factory is 
    85          * currently tracking. 
    86          *  
    87          * @return The set of currently tracked viewers.  
    88          */ 
    89         static Set getViewers() { return singleton.viewers; } 
     86         * Adds all the {@link ImViewer} components that this factory is 
     87         * currently tracking to the passed menu. 
     88         *  
     89         * @param menu The menu to add the components to.  
     90         */ 
     91        static void register(JMenu menu) 
     92        {  
     93                //return singleton.viewers;  
     94                if (menu == null) return; 
     95                Iterator i = singleton.viewers.iterator(); 
     96                menu.removeAll(); 
     97                while (i.hasNext())  
     98                        menu.add(new JMenuItem(new ActivationAction((ImViewer) i.next()))); 
     99        } 
    90100 
    91101        /**  
    … …  
    95105         */ 
    96106        static JMenu getWindowMenu() { return singleton.windowMenu; } 
    97  
    98         /** 
    99          * Returns <code>true</code> is the {@link #windowMenu} is attached  
    100          * to the <code>TaskBar</code>, <code>false</code> otherwise. 
    101          * 
    102          * @return See above. 
    103          */ 
    104         static boolean isWindowMenuAttachedToTaskBar() 
    105         { 
    106                 return singleton.isAttached; 
    107         } 
    108107 
    109108        /** Attaches the {@link #windowMenu} to the <code>TaskBar</code>. */ 
    110109        static void attachWindowMenuToTaskBar() 
    111110        { 
    112                 if (isWindowMenuAttachedToTaskBar()) return; 
     111                if (singleton.isAttached) return; 
    113112                TaskBar tb = ImViewerAgent.getRegistry().getTaskBar(); 
    114113                tb.addToMenu(TaskBar.WINDOW_MENU, singleton.windowMenu); 

  • trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/TagSetsLoader.java

    r5420 r5567  
    7474        } 
    7575         
    76         /** 
     76    /** 
    7777     * Retrieves the data. 
    7878     * @see DataBrowserLoader#load() 

  • trunk/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

    r5566 r5567  
    20532053        { 
    20542054                isSessionAlive(); 
     2055                return file; 
     2056                /* 
    20552057                RawFileStore store = getRawFileService(); 
    20562058                store.setFileId(fileID); 
    … …  
    20802082                //store.close(); 
    20812083                return file; 
     2084                */ 
    20822085        } 
    20832086         

  • trunk/SRC/org/openmicroscopy/shoola/env/data/views/MetadataHandlerView.java

    r5487 r5567  
    353353        public CallHandle loadExistingTags(int level, long userID,  
    354354                                          AgentEventListener observer); 
     355         
    355356} 

  • trunk/SRC/org/openmicroscopy/shoola/env/ui/TaskBarView.java

    r5266 r5567  
    436436        } 
    437437         
     438        /** Reference to the manager. */ 
    438439        private TaskBarManager manager; 
    439440         
    … …  
    441442         * Creates a new instance. 
    442443         *  
     444         * @param manager Reference to the manager. 
    443445         * @param im    The {@link IconManager} singleton that we use to retrieve 
    444446         *                              the various icons. 

  • trunk/config/container.xml

    r5566 r5567  
    171171        <config>dataBrowser.xml</config> 
    172172    </agent> 
     173    <agent> 
     174        <name>Editor</name> 
     175        <class>org.openmicroscopy.shoola.agents.editor.EditorAgent</class> 
     176        <config>editor.xml</config> 
     177    </agent> 
    173178    </structuredEntry> 
    174179  </agents> 

Download in other formats:

  • Unified Diff
  • Zip Archive
Trac Powered

Powered by Trac 0.11
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/