Author: kono
Date: 2011-09-27 11:01:51 -0700 (Tue, 27 Sep 2011)
New Revision: 26982
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
Log:
Import statements had been organized. No functional changes.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -1,82 +1,65 @@
package org.cytoscape.view.vizmap.gui.internal;
-import org.cytoscape.io.read.VizmapReaderManager;
-import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.view.vizmap.VisualMappingManager;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
-import org.cytoscape.event.CyEventHelper;
+import java.awt.Color;
+import java.awt.Paint;
+import java.util.Properties;
+
+import javax.swing.table.DefaultTableCellRenderer;
+
import org.cytoscape.application.CyApplicationConfiguration;
-import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
-import org.cytoscape.view.vizmap.VisualStyleFactory;
-import org.cytoscape.model.CyTableManager;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.io.read.VizmapReaderManager;
import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNetworkTableManager;
-import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.service.util.AbstractCyActivator;
import org.cytoscape.service.util.CyServiceRegistrar;
-
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
+import org.cytoscape.view.vizmap.gui.VisualPropertyDependency;
+import org.cytoscape.view.vizmap.gui.action.VizMapUIAction;
import org.cytoscape.view.vizmap.gui.dependency.NodeSizeDependency;
+import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
+import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
+import org.cytoscape.view.vizmap.gui.internal.bypass.BypassManager;
+import org.cytoscape.view.vizmap.gui.internal.editor.ColorVisualPropertyEditor;
+import org.cytoscape.view.vizmap.gui.internal.editor.EditorManagerImpl;
+import
org.cytoscape.view.vizmap.gui.internal.editor.NumberVisualPropertyEditor;
+import
org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.CyColorChooser;
+import org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.FontEditor;
+import
org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.NumericValueEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.StringValueEditor;
-import org.cytoscape.view.vizmap.gui.internal.util.DefaultVisualStyleBuilder;
-import
org.cytoscape.view.vizmap.gui.internal.task.CreateNewVisualStyleTaskFactory;
-import org.cytoscape.view.vizmap.gui.internal.DefaultViewEditorImpl;
-import
org.cytoscape.view.vizmap.gui.internal.VisualPropertyDependencyManagerImpl;
-import
org.cytoscape.view.vizmap.gui.internal.task.RenameVisualStyleTaskFactory;
-import org.cytoscape.view.vizmap.gui.internal.VizMapPropertySheetBuilder;
-import com.l2fprod.common.propertysheet.PropertySheetPanel;
-import org.cytoscape.view.vizmap.gui.internal.VizMapperMainPanel;
import
org.cytoscape.view.vizmap.gui.internal.event.VizMapEventHandlerManagerImpl;
-import org.cytoscape.view.vizmap.gui.internal.theme.ColorManager;
-import
org.cytoscape.view.vizmap.gui.internal.task.ImportDefaultVizmapTaskFactory;
import org.cytoscape.view.vizmap.gui.internal.task.CopyVisualStyleTaskFactory;
-import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RainbowColorMappingGenerator;
-import org.cytoscape.view.vizmap.gui.internal.theme.IconManager;
-import org.cytoscape.view.vizmap.gui.internal.editor.EditorManagerImpl;
-import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RainbowOscColorMappingGenerator;
import org.cytoscape.view.vizmap.gui.internal.task.CreateLegendTaskFactory;
-import org.cytoscape.view.vizmap.gui.internal.bypass.BypassManager;
+import
org.cytoscape.view.vizmap.gui.internal.task.CreateNewVisualStyleTaskFactory;
import
org.cytoscape.view.vizmap.gui.internal.task.DeleteMappingFunctionTaskFactory;
-import org.cytoscape.view.vizmap.gui.internal.AttributeSetManager;
-import java.lang.Class;
-import
org.cytoscape.view.vizmap.gui.internal.editor.NumberVisualPropertyEditor;
-import org.cytoscape.view.vizmap.gui.internal.editor.ColorVisualPropertyEditor;
import
org.cytoscape.view.vizmap.gui.internal.task.DeleteVisualStyleTaskFactory;
-import org.cytoscape.view.vizmap.gui.internal.VizMapperMenuManager;
+import
org.cytoscape.view.vizmap.gui.internal.task.ImportDefaultVizmapTaskFactory;
+import
org.cytoscape.view.vizmap.gui.internal.task.RenameVisualStyleTaskFactory;
+import org.cytoscape.view.vizmap.gui.internal.theme.ColorManager;
+import org.cytoscape.view.vizmap.gui.internal.theme.IconManager;
+import org.cytoscape.view.vizmap.gui.internal.util.DefaultVisualStyleBuilder;
import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
-import javax.swing.table.DefaultTableCellRenderer;
-import org.cytoscape.view.vizmap.gui.internal.SelectedVisualStyleManagerImpl;
-import org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.FontEditor;
-import
org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.NumericValueEditor;
-import
org.cytoscape.view.vizmap.gui.internal.editor.valueeditor.CyColorChooser;
+import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RainbowColorMappingGenerator;
+import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RainbowOscColorMappingGenerator;
import
org.cytoscape.view.vizmap.gui.internal.util.mapgenerator.RandomColorMappingGenerator;
-import org.cytoscape.view.vizmap.gui.internal.DefaultViewPanelImpl;
-import
org.cytoscape.view.vizmap.gui.internal.MappingFunctionFactoryManagerImpl;
-import org.cytoscape.view.vizmap.gui.internal.EditorWindowManager;
-import java.awt.Color;
-import java.awt.Paint;
-
import org.cytoscape.view.vizmap.gui.util.DiscreteMappingGenerator;
-
-import org.cytoscape.view.presentation.RenderingEngineFactory;
-import org.cytoscape.view.vizmap.gui.util.DiscreteMappingGenerator;
-import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
import org.cytoscape.work.TaskFactory;
-import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
-import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
-import org.cytoscape.view.vizmap.gui.action.VizMapUIAction;
-import org.cytoscape.view.vizmap.gui.VisualPropertyDependency;
-
+import org.cytoscape.work.swing.GUITaskManager;
import org.osgi.framework.BundleContext;
-import org.cytoscape.service.util.AbstractCyActivator;
+import com.l2fprod.common.propertysheet.PropertySheetPanel;
-import java.util.Properties;
-
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
super();
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -5,7 +5,6 @@
import java.util.Hashtable;
import java.util.Map;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNode;
import org.cytoscape.service.util.CyServiceRegistrar;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -4,7 +4,6 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyNetworkTableManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -36,7 +36,6 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.model.CyNetworkTableManager;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditor.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditor.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -8,7 +8,6 @@
import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -2,15 +2,8 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
import javax.swing.JComboBox;
-import javax.swing.event.PopupMenuEvent;
-import javax.swing.event.PopupMenuListener;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.events.SetCurrentNetworkViewEvent;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -39,7 +39,6 @@
import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.model.Visualizable;
import org.cytoscape.view.vizmap.VisualMappingFunction;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTask.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTask.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -7,7 +7,6 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.io.read.VizmapReader;
import org.cytoscape.io.read.VizmapReaderManager;
-import org.cytoscape.property.CyProperty;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.AbstractTask;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
2011-09-27 01:33:10 UTC (rev 26981)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/util/DefaultVisualStyleBuilder.java
2011-09-27 18:01:51 UTC (rev 26982)
@@ -1,20 +1,23 @@
package org.cytoscape.view.vizmap.gui.internal.util;
-import static org.cytoscape.view.presentation.property.MinimalVisualLexicon.*;
+import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.EDGE_LABEL;
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.EDGE_LABEL_COLOR;
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.EDGE_PAINT;
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NETWORK_BACKGROUND_PAINT;
+import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NODE_FILL_COLOR;
+import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NODE_HEIGHT;
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NODE_LABEL;
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NODE_LABEL_COLOR;
+import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NODE_WIDTH;
import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
-import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.mappings.PassthroughMapping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
--
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.
