Author: mes
Date: 2012-05-01 14:41:14 -0700 (Tue, 01 May 2012)
New Revision: 29065
Removed:
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactory.java
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTaskManager.java
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandler.java
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandlerFactory.java
core3/api/trunk/work-swing-api/src/test/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactoryTest.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuItem.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuListener.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
Modified:
core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
core3/api/trunk/app-api/src/test/java/org/cytoscape/app/CyAppAdapterTest.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewTest.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/MacCyActivator.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
Log:
Removed concept of SubmenuTaskManager
Modified:
core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
===================================================================
--- core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-05-01 21:11:17 UTC (rev 29064)
+++ core3/api/trunk/app-api/src/main/java/org/cytoscape/app/CyAppAdapter.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -35,7 +35,6 @@
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.cytoscape.task.visualize.ApplyPreferredLayoutTaskFactory;
import org.cytoscape.task.visualize.ApplyVisualStyleTaskFactory;
@@ -232,12 +231,6 @@
DialogTaskManager getDialogTaskManager();
/**
- * Returns an instance of {@link SubmenuTaskManager}.
- * @return an instance of {@link SubmenuTaskManager}.
- */
- SubmenuTaskManager getSubmenuTaskManager();
-
- /**
* Returns an instance of {@link PanelTaskManager}.
* @return an instance of {@link PanelTaskManager}.
*/
Modified:
core3/api/trunk/app-api/src/test/java/org/cytoscape/app/CyAppAdapterTest.java
===================================================================
---
core3/api/trunk/app-api/src/test/java/org/cytoscape/app/CyAppAdapterTest.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/api/trunk/app-api/src/test/java/org/cytoscape/app/CyAppAdapterTest.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -94,11 +94,6 @@
}
@Test
- public void testSubmenuTaskManager() {
- assertNotNull("SubmenuTaskManager exists",
adapter.getSubmenuTaskManager());
- }
-
- @Test
public void testGetRenderingEngineManager() {
assertNotNull("RenderingEngineManager exists",
adapter.getRenderingEngineManager());
}
Deleted:
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactory.java
===================================================================
---
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactory.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactory.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,24 +0,0 @@
-package org.cytoscape.work.swing;
-
-import org.cytoscape.work.BasicTunableHandlerFactory;
-
-/**
- * A specialization for SubmenuTunableHandlers.
- * @param <T>
- * @CyAPI.Final.Class
- */
-public final class SimpleSubmenuTunableHandlerFactory<T extends
SubmenuTunableHandler> extends BasicTunableHandlerFactory<T> implements
SubmenuTunableHandlerFactory<T> {
-
- /**
- * Constructs this BasicSubmenuTunableHandlerFactory.
- * @param specificHandlerType The class of the specific handler to be
constructed
- * to handle the matching classes. For instance FloatHandler.class
might be specified
- * to handle values with a Float type.
- * @param classesToMatch One or more class types that will be handled
by this handler.
- * For example the FloatHandler might handle both Float.class and
float.class.
- */
- public SimpleSubmenuTunableHandlerFactory(Class<T> specificHandlerType,
Class<?>... classesToMatch ) {
- super(specificHandlerType, classesToMatch);
- }
-
-}
Deleted:
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTaskManager.java
===================================================================
---
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTaskManager.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTaskManager.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,21 +0,0 @@
-
-
-package org.cytoscape.work.swing;
-
-
-
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskManager;
-
-/**
- * A specialization of a TaskManager that creates a DynamicSubmenuListener
- * configuration object. The DynamicSubmenuListener object will dynamically
- * create a set of submenus based on the presense of a
- * {@link org.cytoscape.work.util.ListSingleSelection}<String> field
- * or method annotated with {@link org.cytoscape.work.Tunable}. The strings
- * found in the ListSingleSelection object will define the submenus.
- * @CyAPI.Api.Interface
- */
-public interface SubmenuTaskManager extends
TaskManager<DynamicSubmenuListener,Object> {
-
-}
Deleted:
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandler.java
===================================================================
---
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandler.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandler.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,37 +0,0 @@
-package org.cytoscape.work.swing;
-
-
-import javax.swing.JMenuItem;
-
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TunableHandler;
-
-/**
- * A TunableHandler specifically for generating dynamic submenus.
- * @CyAPI.Spi.Interface
- */
-public interface SubmenuTunableHandler extends TunableHandler {
-
- /**
- * Returns the dynamically created submenu item that will
- * be used by DynamicSubmenusListener.
- * @return the dynamically created submenu item that will
- * be used by DynamicSubmenusListener.
- */
- public JMenuItem getSubmenuItem();
-
- /**
- * This method will be called when a submenu is chosen. The intent
- * is for this method to then set the value in the ListSingleSelection
object.
- * @param menuName The name of the menu selected.
- */
- public void chosenMenu(String menuName);
-
- /**
- * Because clicking on a submenu is already an "action" we need to be
able
- * actually tell the handler which task to execute and how.
- * @param dtm The DialogTaskManager to be used to execute the
TaskFactory.
- * @param tf The TaskFactory to be executed.
- */
- public void setExecutionParams(DialogTaskManager dtm, TaskFactory tf);
-}
Deleted:
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandlerFactory.java
===================================================================
---
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandlerFactory.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/api/trunk/work-swing-api/src/main/java/org/cytoscape/work/swing/SubmenuTunableHandlerFactory.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,12 +0,0 @@
-package org.cytoscape.work.swing;
-
-import org.cytoscape.work.TunableHandlerFactory;
-
-/**
- * A specialization of TunableHandlerFactory for SubmenuTunableHandler.
- * @param <T>
- * @CyAPI.Spi.Interface
- */
-public interface SubmenuTunableHandlerFactory<T extends SubmenuTunableHandler>
extends TunableHandlerFactory<T> {
-
-}
Deleted:
core3/api/trunk/work-swing-api/src/test/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactoryTest.java
===================================================================
---
core3/api/trunk/work-swing-api/src/test/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactoryTest.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/api/trunk/work-swing-api/src/test/java/org/cytoscape/work/swing/SimpleSubmenuTunableHandlerFactoryTest.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,56 +0,0 @@
-package org.cytoscape.work.swing;
-
-import static org.junit.Assert.*;
-
-import java.lang.reflect.Field;
-
-import javax.swing.JMenuItem;
-
-import org.cytoscape.work.AbstractTunableHandler;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.Tunable;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class SimpleSubmenuTunableHandlerFactoryTest {
-
- private SimpleSubmenuTunableHandlerFactory<DummySubmenuTunableHandler>
factory;
-
- @Before
- public void setUp() throws Exception {
- factory = new
SimpleSubmenuTunableHandlerFactory<DummySubmenuTunableHandler>(DummySubmenuTunableHandler.class,
Object.class);
- }
-
- @Test
- public void testSimpleSubmenuTunableHandlerFactory() {
- assertNotNull(factory);
- }
-
- private static final class DummySubmenuTunableHandler extends
AbstractTunableHandler implements
- SubmenuTunableHandler {
-
- public DummySubmenuTunableHandler(Field field, Object instance,
Tunable tunable) {
- super(field, instance, tunable);
- }
-
- @Override
- public void handle() {
- }
-
- @Override
- public JMenuItem getSubmenuItem() {
- return null;
- }
-
- @Override
- public void chosenMenu(String menuName) {
- }
-
- @Override
- public void setExecutionParams(DialogTaskManager dtm,
TaskFactory tf) {
- }
-
- }
-
-}
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -40,7 +40,6 @@
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.io.read.CyNetworkReaderManager;
@@ -146,7 +145,6 @@
CyTableReaderManager cyTableReaderManagerRef =
getService(bc,CyTableReaderManager.class);
PanelTaskManager panelTaskManagerRef =
getService(bc,PanelTaskManager.class);
DialogTaskManager dialogTaskManagerRef =
getService(bc,DialogTaskManager.class);
- SubmenuTaskManager submenuTaskManagerRef =
getService(bc,SubmenuTaskManager.class);
PresentationWriterManager presentationWriterManagerRef =
getService(bc,PresentationWriterManager.class);
RenderingEngineManager renderingEngineManagerRef =
getService(bc,RenderingEngineManager.class);
TaskManager taskManagerRef = getService(bc,TaskManager.class);
@@ -261,7 +259,6 @@
cytoscapeVersionService,
dialogTaskManagerRef,
panelTaskManagerRef,
-
submenuTaskManagerRef,
presentationWriterManagerRef,
renderingEngineManagerRef,
taskManagerRef,
@@ -328,6 +325,7 @@
expandGroupTaskFactory,
unGroupNodesTaskFactory
);
+
AppLoaderTaskFactory appLoaderTaskFactory = new
AppLoaderTaskFactory(cyAppAdapter);
AppManagerAction appManagerAction = new AppManagerAction(
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -115,7 +115,6 @@
import org.cytoscape.work.swing.AbstractGUITunableHandler;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.cytoscape.work.util.BoundedDouble;
import org.cytoscape.task.NetworkViewTaskFactory;
@@ -164,7 +163,6 @@
// private final CyTableWriterManager cyTableWriterManager;
private final DialogTaskManager dialogTaskManager;
private final PanelTaskManager panelTaskManager;
- private final SubmenuTaskManager submenuTaskManager;
private final PresentationWriterManager presentationWriterManager;
private final RenderingEngineManager renderingEngineManager;
private final TaskManager taskManager;
@@ -312,7 +310,6 @@
// final CyTableWriterManager cyTableWriterManager,
final DialogTaskManager dialogTaskManager,
final PanelTaskManager panelTaskManager,
- final SubmenuTaskManager submenuTaskManager,
final PresentationWriterManager
presentationWriterManager,
final RenderingEngineManager
renderingEngineManager,
final TaskManager taskManager,
@@ -421,7 +418,6 @@
// this.cyTableWriterManager = cyTableWriterManager;
this.dialogTaskManager = dialogTaskManager;
this.panelTaskManager = panelTaskManager;
- this.submenuTaskManager = submenuTaskManager;
this.presentationWriterManager = presentationWriterManager;
this.renderingEngineManager = renderingEngineManager;
this.taskManager = taskManager;
@@ -523,7 +519,6 @@
// public CyTableWriterManager getCyTableWriterManager() { return
cyTableWriterManager; }
public DialogTaskManager getDialogTaskManager() { return
dialogTaskManager; }
public PanelTaskManager getPanelTaskManager() { return
panelTaskManager; }
- public SubmenuTaskManager getSubmenuTaskManager() { return
submenuTaskManager; }
public PresentationWriterManager getPresentationWriterManager() {
return presentationWriterManager; }
public RenderingEngineManager getRenderingEngineManager() { return
renderingEngineManager; }
public TaskManager getTaskManager() { return taskManager; }
Modified:
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
===================================================================
---
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -95,7 +95,6 @@
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.junit.Before;
@@ -132,7 +131,6 @@
// mock(CyTableWriterManager.class),
mock(DialogTaskManager.class),
mock(PanelTaskManager.class),
- mock(SubmenuTaskManager.class),
mock(PresentationWriterManager.class),
mock(RenderingEngineManager.class),
mock(TaskManager.class),
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -67,7 +67,6 @@
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.osgi.framework.BundleContext;
@@ -96,7 +95,6 @@
CyTableFactory cyDataTableFactoryServiceRef = getService(bc,
CyTableFactory.class);
SpacialIndex2DFactory spacialIndex2DFactoryServiceRef =
getService(bc, SpacialIndex2DFactory.class);
DialogTaskManager dialogTaskManager = getService(bc,
DialogTaskManager.class);
- SubmenuTaskManager submenuTaskManager = getService(bc,
SubmenuTaskManager.class);
CyServiceRegistrar cyServiceRegistrarRef = getService(bc,
CyServiceRegistrar.class);
CyNetworkManager cyNetworkManagerServiceRef = getService(bc,
CyNetworkManager.class);
CyEventHelper cyEventHelperServiceRef = getService(bc,
CyEventHelper.class);
@@ -120,7 +118,7 @@
DingRenderingEngineFactory dingRenderingEngineFactory = new
DingRenderingEngineFactory(
cyDataTableFactoryServiceRef,
cyRootNetworkFactoryServiceRef, undoSupportServiceRef,
- spacialIndex2DFactoryServiceRef,
dVisualLexicon, dialogTaskManager, submenuTaskManager,
+ spacialIndex2DFactoryServiceRef,
dVisualLexicon, dialogTaskManager,
cyServiceRegistrarRef,
cyNetworkTableManagerServiceRef, cyEventHelperServiceRef,
renderingEngineManagerServiceRef, vtfListener,
annotationFactoryManager, dingGraphLOD);
DingNavigationRenderingEngineFactory
dingNavigationRenderingEngineFactory = new DingNavigationRenderingEngineFactory(
@@ -135,7 +133,7 @@
DingViewModelFactory dingNetworkViewFactory = new
DingViewModelFactory(cyDataTableFactoryServiceRef,
cyRootNetworkFactoryServiceRef,
undoSupportServiceRef, spacialIndex2DFactoryServiceRef, dVisualLexicon,
- dialogTaskManager, submenuTaskManager,
cyServiceRegistrarRef, cyNetworkTableManagerServiceRef,
+ dialogTaskManager, cyServiceRegistrarRef,
cyNetworkTableManagerServiceRef,
cyEventHelperServiceRef, vtfListener,
annotationFactoryManager, dingGraphLOD);
// Edge Bend editor
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -134,7 +134,6 @@
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -393,7 +392,6 @@
final Map<CyNodeViewContextMenuFactory, Map>
cyNodeViewContextMenuFactory;
final DialogTaskManager manager;
- final SubmenuTaskManager menuTaskManager;
// Will be injected.
final VisualLexicon dingLexicon;
@@ -413,13 +411,13 @@
SpacialIndex2DFactory spacialFactory,
final VisualLexicon dingLexicon,
ViewTaskFactoryListener vtfl,
- DialogTaskManager manager, SubmenuTaskManager
menuTaskManager,
+ DialogTaskManager manager,
CyEventHelper eventHelper,
CyNetworkTableManager tableMgr,
AnnotationFactoryManager annMgr, final DingGraphLOD
dingGraphLOD) {
this(view.getModel(), dataFactory, cyRoot, undo,
spacialFactory, dingLexicon,
- vtfl, manager, menuTaskManager, eventHelper,
tableMgr, annMgr, dingGraphLOD);
+ vtfl, manager, eventHelper, tableMgr, annMgr,
dingGraphLOD);
}
@@ -446,7 +444,7 @@
SpacialIndex2DFactory spacialFactory,
final VisualLexicon dingLexicon,
ViewTaskFactoryListener vtfl,
- DialogTaskManager manager, SubmenuTaskManager
menuTaskManager,
+ DialogTaskManager manager,
CyEventHelper cyEventHelper,
CyNetworkTableManager tableMgr,
AnnotationFactoryManager annMgr, final DingGraphLOD
dingGraphLOD) {
@@ -465,7 +463,7 @@
this.cyNodeViewContextMenuFactory =
vtfl.cyNodeViewContexMenuFactory;
this.manager = manager;
- this.menuTaskManager = menuTaskManager;
+
this.cyEventHelper = cyEventHelper;
final CyTable nodeCAM = dataFactory.createTable("node view",
CyIdentifiable.SUID, Long.class, false, false);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -24,7 +24,6 @@
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +43,6 @@
private final AnnotationFactoryManager annMgr;
private DialogTaskManager dialogTaskManager;
- private SubmenuTaskManager menuTaskManager;
private final CyNetworkTableManager tableMgr;
private final CyEventHelper eventHelper;
@@ -56,7 +54,6 @@
CyRootNetworkManager rootNetworkManager, UndoSupport
undo,
SpacialIndex2DFactory spacialFactory, VisualLexicon
dingLexicon,
DialogTaskManager dialogTaskManager,
- SubmenuTaskManager menuTaskManager,
CyServiceRegistrar registrar,
CyNetworkTableManager tableMgr,
CyEventHelper eventHelper,
@@ -70,7 +67,6 @@
this.undo = undo;
this.dingLexicon = dingLexicon;
this.dialogTaskManager = dialogTaskManager;
- this.menuTaskManager = menuTaskManager;
this.registrar = registrar;
this.tableMgr = tableMgr;
this.eventHelper = eventHelper;
@@ -118,7 +114,7 @@
else
dgv = new DGraphView(targetView,
dataTableFactory,
rootNetworkManager, undo,
spacialFactory, dingLexicon,
- vtfListener,dialogTaskManager,
menuTaskManager, eventHelper, tableMgr, annMgr, dingGraphLOD);
+ vtfListener,dialogTaskManager,
eventHelper, tableMgr, annMgr, dingGraphLOD);
logger.info("DGraphView created as a presentation for
view model: "
+ targetView.getSUID());
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -15,7 +15,6 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +31,6 @@
private final CyServiceRegistrar registrar;
private DialogTaskManager dialogTaskManager;
- private SubmenuTaskManager menuTaskManager;
private final CyNetworkTableManager tableMgr;
private final CyEventHelper eventHelper;
private ViewTaskFactoryListener vtfListener;
@@ -42,7 +40,7 @@
public DingViewModelFactory(CyTableFactory dataTableFactory,
CyRootNetworkManager rootNetworkManager,
UndoSupport undo, SpacialIndex2DFactory spacialFactory,
VisualLexicon dingLexicon,
- DialogTaskManager dialogTaskManager, SubmenuTaskManager
menuTaskManager,
+ DialogTaskManager dialogTaskManager,
CyServiceRegistrar registrar, CyNetworkTableManager
tableMgr, CyEventHelper eventHelper,
ViewTaskFactoryListener vtfListener,
AnnotationFactoryManager annMgr, DingGraphLOD
dingGraphLOD) {
@@ -58,7 +56,6 @@
this.eventHelper = eventHelper;
this.vtfListener = vtfListener;
this.annMgr = annMgr;
- this.menuTaskManager = menuTaskManager;
this.dingGraphLOD = dingGraphLOD;
}
@@ -74,7 +71,7 @@
throw new IllegalArgumentException("Cannot create view
without model.");
final DGraphView dgv = new DGraphView(network,
dataTableFactory, rootNetworkManager, undo, spacialFactory, dingLexicon,
- vtfListener, dialogTaskManager,
menuTaskManager, eventHelper, tableMgr, annMgr, dingGraphLOD);
+ vtfListener, dialogTaskManager, eventHelper,
tableMgr, annMgr, dingGraphLOD);
registrar.registerAllServices(dgv, new Properties());
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/PopupMenuHelper.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -187,17 +187,6 @@
String pref = (String)(props.get("preferredMenu"));
String toolTip = (String) (props.get("tooltip"));
- // check if the menus are created dynamically, and if so add
the listener
- final Object preferredTaskManager =
props.get("preferredTaskManager");
- if ( preferredTaskManager != null &&
preferredTaskManager.toString().equals("menu")) {
- if ( title == null )
- title = "Dynamic";
- DynamicSubmenuListener submenu =
m_view.menuTaskManager.getConfiguration(tf, tunableContext);
- submenu.setMenuTitle(title);
- popup.addPopupMenuListener( submenu );
- return;
- }
-
// otherwise create our own popup menus
boolean useCheckBoxMenuItem = false;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/NetworkViewTestSupport.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -16,7 +16,6 @@
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
public class NetworkViewTestSupport extends NetworkTestSupport {
@@ -36,7 +35,6 @@
new RTreeFactory(),
dVisualLexicon,
mock(DialogTaskManager.class),
-
mock(SubmenuTaskManager.class),
mock(CyServiceRegistrar.class),
networkTableMgr,
mock(CyEventHelper.class),
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewTest.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/DGraphViewTest.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,45 +1,13 @@
package org.cytoscape.ding.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JPanel;
-
-import org.cytoscape.ding.impl.cyannotator.create.AnnotationFactoryManager;
-import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
-import org.cytoscape.ding.impl.DingViewModelFactory;
-import org.cytoscape.ding.impl.ViewTaskFactoryListener;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNetworkTableManager;
-import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.model.NetworkTestSupport;
-import org.cytoscape.model.TableTestSupport;
-import org.cytoscape.model.subnetwork.CyRootNetworkManager;
-import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.spacial.SpacialIndex2DFactory;
-import org.cytoscape.spacial.internal.rtree.RTreeFactory;
-import org.cytoscape.task.EdgeViewTaskFactory;
-import org.cytoscape.task.NetworkViewTaskFactory;
-import org.cytoscape.task.NodeViewTaskFactory;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.CyNetworkViewFactory;
+
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.presentation.AbstractRenderingEngineTest;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
-import org.cytoscape.view.presentation.RenderingEngineManager;
-import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
-import org.cytoscape.work.undo.UndoSupport;
-import org.junit.Test;
import org.cytoscape.ding.*;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNetworkViewTest.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -24,7 +24,6 @@
import org.cytoscape.view.model.AbstractCyNetworkViewTest;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.junit.Before;
import org.mockito.Mock;
@@ -53,8 +52,6 @@
@Mock
private DialogTaskManager manager;
@Mock
- private SubmenuTaskManager submenuTaskManager;
- @Mock
private CyEventHelper eventHelper;
@Mock
private CyNetworkTableManager tableMgr;
@@ -81,7 +78,7 @@
vtfl,
/*nodeViewTFs, edgeViewTFs, emptySpaceTFs,
dropNodeViewTFs,
dropEmptySpaceTFs, */
- manager, submenuTaskManager, eventHelper,
tableMgr,annMgr, dingGRaphLOD);
+ manager, eventHelper, tableMgr,annMgr,
dingGRaphLOD);
}
@Override
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/view/DNodeViewTest.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -40,7 +40,6 @@
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
import org.cytoscape.view.presentation.property.values.NodeShape;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.undo.UndoSupport;
import org.junit.After;
import org.junit.Before;
@@ -79,8 +78,6 @@
@Mock
private DialogTaskManager manager;
@Mock
- private SubmenuTaskManager submenuTaskManager;
- @Mock
private CyEventHelper eventHelper;
@Mock
private CyNetworkTableManager tableMgr;
@@ -118,7 +115,7 @@
networkView = new DGraphView(network, dataFactory, cyRoot,
undo, spacialFactory, lexicon,
vtfl,
/*nodeViewTFs, edgeViewTFs, emptySpaceTFs,
dropNodeViewTFs,
- dropEmptySpaceTFs,*/ manager,
submenuTaskManager, eventHelper, tableMgr, annMgr, dingGraphLOD);
+ dropEmptySpaceTFs,*/ manager, eventHelper,
tableMgr, annMgr, dingGraphLOD);
dnv1 = (DNodeView) networkView.getDNodeView(node1);
dnv2 = (DNodeView) networkView.getDNodeView(node2);
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/CyActivator.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -126,7 +126,6 @@
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.PanelTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.swing.undo.SwingUndoSupport;
import org.osgi.framework.BundleContext;
@@ -165,7 +164,6 @@
CyNetworkManager cyNetworkManagerServiceRef = getService(bc,
CyNetworkManager.class);
DialogTaskManager dialogTaskManagerServiceRef = getService(bc,
DialogTaskManager.class);
PanelTaskManager panelTaskManagerServiceRef = getService(bc,
PanelTaskManager.class);
- SubmenuTaskManager submenuTaskManagerServiceRef =
getService(bc, SubmenuTaskManager.class);
RenderingEngineFactory
dingNavigationPresentationFactoryServiceRef = getService(bc,
RenderingEngineFactory.class,
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/MacCyActivator.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/MacCyActivator.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/MacCyActivator.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -4,7 +4,7 @@
import org.cytoscape.application.CyVersion;
import org.cytoscape.internal.dialogs.AboutDialogFactoryImpl;
import org.cytoscape.service.util.AbstractCyActivator;
-import org.cytoscape.work.swing.SubmenuTaskManager;
+import org.cytoscape.work.swing.DialogTaskManager;
import org.osgi.framework.BundleContext;
import com.apple.eawt.AboutHandler;
@@ -18,9 +18,9 @@
@Override
public void start(BundleContext context) throws Exception {
final CyShutdown shutdown = getService(context,
CyShutdown.class);
- final SubmenuTaskManager taskManager = getService(context,
SubmenuTaskManager.class);
final CyVersion version = getService(context, CyVersion.class);
final AboutDialogFactoryImpl aboutDialogFactory = new
AboutDialogFactoryImpl(version);
+ final DialogTaskManager taskManager =
getService(context,DialogTaskManager.class);
Application application = Application.getApplication();
application.setQuitHandler(new QuitHandler() {
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/CyActivator.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -15,9 +15,6 @@
import org.cytoscape.work.TunableHandlerFactory;
import org.cytoscape.work.TunableRecorder;
import org.cytoscape.work.TunableSetter;
-import org.cytoscape.work.internal.submenu.SubmenuTaskManagerImpl;
-import org.cytoscape.work.internal.submenu.SubmenuTunableHandlerImpl;
-import org.cytoscape.work.internal.submenu.SubmenuTunableMutator;
import org.cytoscape.work.internal.sync.SyncTaskManager;
import org.cytoscape.work.internal.sync.SyncTunableHandlerFactory;
import org.cytoscape.work.internal.sync.SyncTunableMutator;
@@ -43,9 +40,6 @@
import org.cytoscape.work.swing.GUITunableHandlerFactory;
import org.cytoscape.work.swing.PanelTaskManager;
import org.cytoscape.work.swing.SimpleGUITunableHandlerFactory;
-import org.cytoscape.work.swing.SimpleSubmenuTunableHandlerFactory;
-import org.cytoscape.work.swing.SubmenuTaskManager;
-import org.cytoscape.work.swing.SubmenuTunableHandlerFactory;
import org.cytoscape.work.swing.undo.SwingUndoSupport;
import org.cytoscape.work.undo.UndoSupport;
import org.cytoscape.work.util.BoundedDouble;
@@ -73,16 +67,11 @@
JDialogTunableMutator jDialogTunableMutator = new
JDialogTunableMutator();
JPanelTunableMutator jPanelTunableMutator = new
JPanelTunableMutator();
-
- SimpleSubmenuTunableHandlerFactory<SubmenuTunableHandlerImpl>
submenuListSingleSelectionHandlerFactory = new
SimpleSubmenuTunableHandlerFactory<SubmenuTunableHandlerImpl>(
- SubmenuTunableHandlerImpl.class,
ListSingleSelection.class);
+
JDialogTaskManager jDialogTaskManager = new
JDialogTaskManager(jDialogTunableMutator);
- SubmenuTunableMutator submenuTunableMutator = new
SubmenuTunableMutator(jDialogTaskManager);
-
PanelTaskManager jPanelTaskManager = new
JPanelTaskManager(jPanelTunableMutator, jDialogTaskManager);
- SubmenuTaskManager submenuTaskManager = new
SubmenuTaskManagerImpl(submenuTunableMutator,jDialogTaskManager);
SupportedFileTypesManager supportedFileTypesManager = new
SupportedFileTypesManager();
SimpleGUITunableHandlerFactory<BooleanHandler>
booleanHandlerFactory = new SimpleGUITunableHandlerFactory<BooleanHandler>(
@@ -126,12 +115,8 @@
registerService(bc,jDialogTaskManager,TaskManager.class, new
Properties());
registerService(bc,jPanelTaskManager,PanelTaskManager.class,
new Properties());
-
- registerService(bc,submenuTaskManager,SubmenuTaskManager.class,
new Properties());
registerAllServices(bc,syncTaskManager, new Properties());
-
-
registerService(bc,submenuListSingleSelectionHandlerFactory,SubmenuTunableHandlerFactory.class,
new Properties());
registerService(bc,integerHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
registerService(bc,floatHandlerFactory,GUITunableHandlerFactory.class, new
Properties());
@@ -161,9 +146,6 @@
registerServiceListener(bc,jPanelTunableMutator,"addTunableHandlerFactory","removeTunableHandlerFactory",GUITunableHandlerFactory.class,
TunableHandlerFactory.class);
registerServiceListener(bc,jDialogTunableMutator,"addTunableHandlerFactory","removeTunableHandlerFactory",GUITunableHandlerFactory.class,
TunableHandlerFactory.class);
-
-
registerServiceListener(bc,submenuTunableMutator,"addTunableHandlerFactory","removeTunableHandlerFactory",SubmenuTunableHandlerFactory.class,
TunableHandlerFactory.class);
-
registerServiceListener(bc,syncTunableMutator,"addTunableHandlerFactory","removeTunableHandlerFactory",SyncTunableHandlerFactory.class,
TunableHandlerFactory.class);
TunableRecorderManager trm = new TunableRecorderManager();
registerServiceListener(bc,trm,"addTunableRecorder","removeTunableRecorder",TunableRecorder.class);
Deleted:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuItem.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuItem.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuItem.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,35 +0,0 @@
-
-package org.cytoscape.work.internal.submenu;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JMenuItem;
-
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTunableHandler;
-
-class SubmenuItem extends JMenuItem implements ActionListener {
-
- private final DialogTaskManager dtm;
- private final TaskFactory tf;
- private final SubmenuTunableHandler handler;
- private final String menuName;
-
- SubmenuItem(String menuName, SubmenuTunableHandler handler,
DialogTaskManager dtm, TaskFactory tf) {
- super(menuName);
- this.menuName = menuName;
- this.handler = handler;
- this.dtm = dtm;
- this.tf = tf;
- addActionListener(this);
- }
-
- public void actionPerformed(ActionEvent e) {
- handler.chosenMenu(menuName);
- TaskIterator iterator = tf.createTaskIterator();
- dtm.execute(iterator);
- }
-}
Deleted:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuListener.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuListener.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuListener.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,101 +0,0 @@
-
-package org.cytoscape.work.internal.submenu;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.PopupMenuEvent;
-
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.swing.DynamicSubmenuListener;
-
-class SubmenuListener implements DynamicSubmenuListener {
-
- private final SubmenuTunableMutator stm;
-
- private String menuName;
- private JMenuItem lastMenuItem;
- private boolean enableState;
- private Object tunableContext;
-
- SubmenuListener(SubmenuTunableMutator stm, TaskFactory tf, Object
tunableContext) {
- this.stm = stm;
- this.menuName = "None Specified";
- this.enableState = true;
- this.tunableContext = tunableContext;
- stm.registerTunableContext(tf, tunableContext);
- }
-
- @Override
- public void popupMenuCanceled(PopupMenuEvent e) {
- removePopupMenuItem((JPopupMenu)(e.getSource()));
- }
-
- @Override
- public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
- removePopupMenuItem((JPopupMenu)(e.getSource()));
- }
-
- @Override
- public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
- JPopupMenu parentMenu = (JPopupMenu)(e.getSource());
- lastMenuItem = stm.buildConfiguration(tunableContext);
- if ( lastMenuItem != null ) {
- if ( lastMenuItem instanceof JMenu )
- lastMenuItem.setText(menuName);
- lastMenuItem.setEnabled(enableState);
- parentMenu.add( lastMenuItem );
- }
- }
-
- @Override
- public void menuCanceled(MenuEvent e) {
- removeMenuItem((JMenu)(e.getSource()));
- }
-
- @Override
- public void menuDeselected(MenuEvent e) {
- removeMenuItem((JMenu)(e.getSource()));
- }
-
- @Override
- public void menuSelected(MenuEvent e) {
- JMenu parentMenu = (JMenu)(e.getSource());
- lastMenuItem = stm.buildConfiguration(tunableContext);
- if ( lastMenuItem != null ) {
- String title = lastMenuItem.getText();
- if (title == null || title.isEmpty()) {
- lastMenuItem.setText(menuName);
- }
- lastMenuItem.setEnabled(enableState);
- parentMenu.add( lastMenuItem );
- }
- }
-
- private void removeMenuItem(JMenu parentMenu) {
- if ( lastMenuItem != null ) {
- parentMenu.remove( lastMenuItem );
- lastMenuItem = null;
- }
- }
-
- private void removePopupMenuItem(JPopupMenu parentMenu) {
- if ( lastMenuItem != null ) {
- parentMenu.remove( lastMenuItem );
- lastMenuItem = null;
- }
- }
-
- @Override
- public void setMenuTitle(String name) {
- if ( name == null )
- return;
- menuName = name;
- }
-
- @Override
- public void setEnabled(boolean b) {
- enableState = b;
- }
-}
Deleted:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,31 +0,0 @@
-
-package org.cytoscape.work.internal.submenu;
-
-import org.cytoscape.work.AbstractTaskManager;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.DynamicSubmenuListener;
-import org.cytoscape.work.swing.SubmenuTaskManager;
-
-public class SubmenuTaskManagerImpl extends
AbstractTaskManager<DynamicSubmenuListener,Object> implements
SubmenuTaskManager {
-
- private DialogTaskManager dialogTaskManager;
- private SubmenuTunableMutator stm;
-
- public SubmenuTaskManagerImpl(SubmenuTunableMutator stm,
DialogTaskManager dialogTaskManager) {
- super(stm);
- this.stm = stm;
- this.dialogTaskManager = dialogTaskManager;
- }
-
- public DynamicSubmenuListener getConfiguration(TaskFactory factory,
Object tunableContext) {
- SubmenuListener listener = new SubmenuListener(stm, factory,
tunableContext);
- return listener;
- }
-
- @Override
- public void execute(TaskIterator iterator) {
- dialogTaskManager.execute(iterator);
- }
-}
Deleted:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableHandlerImpl.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,82 +0,0 @@
-package org.cytoscape.work.internal.submenu;
-
-import org.cytoscape.work.AbstractTunableHandler;
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.swing.SubmenuTunableHandler;
-import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.util.ListSingleSelection;
-
-import javax.swing.JMenuItem;
-import javax.swing.JMenu;
-import java.util.List;
-import java.util.Collections;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class SubmenuTunableHandlerImpl extends AbstractTunableHandler
implements SubmenuTunableHandler {
-
- private JMenuItem menuItem;
-
- private DialogTaskManager dtm;
- private TaskFactory tf;
- private static final Logger logger =
LoggerFactory.getLogger(SubmenuTunableHandlerImpl.class);
-
- public SubmenuTunableHandlerImpl(final Field field, final Object
instance, final Tunable tunable) {
- super(field,instance,tunable);
- }
-
- public SubmenuTunableHandlerImpl(final Method getter, final Method
setter, final Object instance, final Tunable tunable) {
- super(getter,setter,instance,tunable);
- }
-
- public void setExecutionParams(DialogTaskManager dtm, TaskFactory tf) {
- this.dtm = dtm;
- this.tf = tf;
- }
-
- public void handle() {
- try {
- Object o = getValue();
- List<String> menuTitles;
- if ( o == null )
- menuTitles = Collections.EMPTY_LIST;
- else
- menuTitles =
((ListSingleSelection<String>)o).getPossibleValues();
-
- if ( menuTitles.size() <= 0 ) {
- menuItem = new SubmenuItem(null,this,dtm,tf);
- } else {
- menuItem = new JMenu((String) null);
- for ( String title : menuTitles )
- ((JMenu)menuItem).add(new
SubmenuItem(title,this,dtm,tf));
- }
-
- } catch (Exception e) { e.printStackTrace(); }
- }
-
-
- public void chosenMenu(String s) {
- try {
- final ListSingleSelection<String> listSingleSelection =
(ListSingleSelection<String>)getValue();
- if ( listSingleSelection != null ) {
- listSingleSelection.setSelectedValue(s);
- setValue(listSingleSelection);
- }
- } catch (Exception e) {
- logger.debug("problem registering the chosen menu :" +
s, e);
- }
- }
-
- public JMenuItem getSubmenuItem() {
- return menuItem;
- }
-
- public String toString() {
- return "SubmenuTunableHandler: ListSingleSelection<String>";
- }
-}
Deleted:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
2012-05-01 21:11:17 UTC (rev 29064)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
2012-05-01 21:41:14 UTC (rev 29065)
@@ -1,53 +0,0 @@
-
-package org.cytoscape.work.internal.submenu;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import javax.swing.JMenuItem;
-
-import org.cytoscape.work.AbstractTunableInterceptor;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TunableMutator;
-import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTunableHandler;
-
-public class SubmenuTunableMutator extends
AbstractTunableInterceptor<SubmenuTunableHandler>
- implements TunableMutator<SubmenuTunableHandler,JMenuItem> {
-
- private final DialogTaskManager dtm;
-
- private final Map<Object, TaskFactory> taskFactoriesByContext;
-
- public SubmenuTunableMutator(DialogTaskManager dtm) {
- this.dtm = dtm;
- taskFactoriesByContext = new WeakHashMap<Object, TaskFactory>();
- }
-
- public void setConfigurationContext(Object o) {
- // no-op
- }
-
- public JMenuItem buildConfiguration(Object objectWithTunables) {
- TaskFactory tf = taskFactoriesByContext.get(objectWithTunables);
- if (tf == null) {
- return null;
- }
-
- for ( SubmenuTunableHandler handler :
getHandlers(objectWithTunables) ) {
- handler.setExecutionParams(dtm,tf);
- handler.handle();
- return handler.getSubmenuItem();
- }
- return null;
- }
-
- public boolean validateAndWriteBack(Object objs) {
- return true;
- }
-
- void registerTunableContext(TaskFactory factory, Object tunableContext)
{
- taskFactoriesByContext.put(tunableContext, factory);
- }
-}
-
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
