Author: jm
Date: 2012-09-25 09:30:39 -0700 (Tue, 25 Sep 2012)
New Revision: 30475
Added:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/ContinuousMappingCellRendererFactory.java
core3/impl/trunk/vizmap-gui-core-impl/
core3/impl/trunk/vizmap-gui-core-impl/pom.xml
core3/impl/trunk/vizmap-gui-core-impl/src/
core3/impl/trunk/vizmap-gui-core-impl/src/main/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/CyActivator.java
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRenderer.java
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRendererFactoryImpl.java
Removed:
core3/api/trunk/model-api/src/main/resources/readme.txt
Modified:
core3/api/trunk/vizmap-gui-api/pom.xml
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
core3/gui-distribution/trunk/features/src/main/resources/features.xml
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/editor/EdgeBendEditor.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
core3/impl/trunk/pom.xml
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
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/editor/BasicVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/BooleanVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/CustomGraphicsVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValueVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.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/StringVisualPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
Log:
Fixes #1477: Removed dependency on l2fprod from vizmap-gui-api. Introduced
ContinuousMappingCellRendererFactory to encapsulate affected code and exposed
as OSGi service in vizmap-gui-core-impl. Needed new bundle to avoid circular
service dependencies between vizmap-gui-impl and ding-presentation-impl. Also
removed readme.txt from model-api.
Deleted: core3/api/trunk/model-api/src/main/resources/readme.txt
===================================================================
--- core3/api/trunk/model-api/src/main/resources/readme.txt 2012-09-25
01:38:11 UTC (rev 30474)
+++ core3/api/trunk/model-api/src/main/resources/readme.txt 2012-09-25
16:30:39 UTC (rev 30475)
@@ -1 +0,0 @@
-Bundle resources go here
Modified: core3/api/trunk/vizmap-gui-api/pom.xml
===================================================================
--- core3/api/trunk/vizmap-gui-api/pom.xml 2012-09-25 01:38:11 UTC (rev
30474)
+++ core3/api/trunk/vizmap-gui-api/pom.xml 2012-09-25 16:30:39 UTC (rev
30475)
@@ -78,25 +78,8 @@
<version>${project.version}</version>
</dependency>
- <!-- Wrapped 3rd party libraries -->
+ <!-- for testing -->
<dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>l2fprod-common-sheet</artifactId>
- <version>7.3</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>l2fprod-common-shared</artifactId>
- <version>7.3</version>
- </dependency>
- <dependency>
- <groupId>cytoscape-temp</groupId>
- <artifactId>l2fprod-common-fontchooser</artifactId>
- <version>7.3</version>
- </dependency>
-
- <!-- for testing -->
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -36,19 +36,12 @@
package org.cytoscape.view.vizmap.gui.editor;
-import java.awt.Component;
import java.beans.PropertyEditor;
import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.JTable;
import javax.swing.table.TableCellRenderer;
-import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
-import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
-
-
/**
* Abstract implementation of Visual Property Editor.
* All editors should extend this class.
@@ -74,24 +67,22 @@
*/
protected TableCellRenderer discreteTableCellRenderer;
- /**
- * The cell renderer for continuous mappings.
- */
- protected TableCellRenderer continuousTableCellRenderer;
-
private final ContinuousEditorType continuousEditorType;
+ private final ContinuousMappingCellRendererFactory cellRendererFactory;
+
/**
* Creates a new AbstractVisualPropertyEditor object.
* @param type The type of this property editor.
* @param propertyEditor the {@link PropertyEditor} to construct this
with.
* @param continuousEditorType the {@link ContinuousEditorType} to
construct this with.
*/
- public AbstractVisualPropertyEditor(final Class<T> type, final
PropertyEditor propertyEditor, ContinuousEditorType continuousEditorType) {
+ public AbstractVisualPropertyEditor(final Class<T> type, final
PropertyEditor propertyEditor, ContinuousEditorType continuousEditorType,
ContinuousMappingCellRendererFactory cellRendererFactory) {
this.type = type;
this.propertyEditor = propertyEditor;
this.continuousEditorType = continuousEditorType;
+ this.cellRendererFactory = cellRendererFactory;
}
@Override
@@ -112,13 +103,13 @@
@Override
public TableCellRenderer getContinuousTableCellRenderer(final
ContinuousMappingEditor<? extends Number, T> continuousMappingEditor) {
- return new
ContinuousMappingCellRenderer(continuousMappingEditor);
+ return
cellRendererFactory.createTableCellRenderer(continuousMappingEditor);
}
@Override
public ContinuousEditorType getContinuousEditorType() {
- return this.continuousEditorType;
+ return continuousEditorType;
}
@Override
@@ -126,47 +117,4 @@
// By default, this class does not return actual icon. This
should be implemented by child class.
return null;
}
-
- /**
- * Cell renderer for the Continuous Editors
- *
- */
- private static final class ContinuousMappingCellRenderer extends
DefaultCellRenderer {
-
- private static final long serialVersionUID =
-6734053848878359286L;
-
- private final ContinuousMappingEditor<?, ?> editor;
-
- public ContinuousMappingCellRenderer(final
ContinuousMappingEditor<?, ?> editor) {
- if (editor == null)
- throw new NullPointerException("Editor object
is null.");
-
- this.editor = editor;
- }
-
- @Override
- public Component getTableCellRendererComponent(JTable table,
Object value, boolean isSelected, boolean hasFocus,
- int row, int column) {
-
- if (value == null || value instanceof ContinuousMapping
== false) {
- this.setText("Unkonown Mapping");
- return this;
- }
-
- if (isSelected) {
- setBackground(table.getSelectionBackground());
- setForeground(table.getSelectionForeground());
- } else {
- setBackground(table.getBackground());
- setForeground(table.getForeground());
- }
-
- final int height = table.getRowHeight(row);
- final int width =
table.getColumnModel().getColumn(column).getWidth();
- final ImageIcon icon = editor.drawIcon(width, height -
2, false);
- this.setIcon(icon);
-
- return this;
- }
- }
}
Added:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/ContinuousMappingCellRendererFactory.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/ContinuousMappingCellRendererFactory.java
(rev 0)
+++
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/editor/ContinuousMappingCellRendererFactory.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -0,0 +1,12 @@
+package org.cytoscape.view.vizmap.gui.editor;
+
+import javax.swing.table.TableCellRenderer;
+
+/**
+ * A factory for creating TableCellRenderers for a particular
ContinuousMappingEditor.
+ *
+ * @CyAPI.Api.Interface
+ */
+public interface ContinuousMappingCellRendererFactory {
+ TableCellRenderer createTableCellRenderer(ContinuousMappingEditor<?
extends Number, ?> editor);
+}
Modified:
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/api/trunk/vizmap-gui-api/src/test/java/org/cytoscape/view/vizmap/gui/editor/AbstractVisualPropertyEditorTest.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -6,11 +6,9 @@
import static org.mockito.Mockito.*;
import java.beans.PropertyEditor;
-import java.util.Set;
import javax.swing.table.TableCellRenderer;
-import org.cytoscape.view.model.VisualProperty;
import org.junit.Test;
import org.junit.Before;
@@ -21,14 +19,22 @@
public DummyEditor(Class<Object> type, PropertyEditor
propertyEditor,
ContinuousEditorType continuousEditorType) {
- super(type, propertyEditor, continuousEditorType);
+ super(type, propertyEditor, continuousEditorType, new
DummyCellRendererFactory());
}
}
+ private class DummyCellRendererFactory implements
ContinuousMappingCellRendererFactory {
+ @Override
+ public TableCellRenderer
createTableCellRenderer(ContinuousMappingEditor<? extends Number, ?> editor) {
+ return renderer;
+ }
+ }
+
DummyEditor editor;
PropertyEditor propertyEditor;
ContinuousEditorType continuousEditorType;
+ TableCellRenderer renderer;
@Before
public void testAbstractVisualPropertyEditor(){
@@ -36,6 +42,7 @@
propertyEditor = mock(PropertyEditor.class);
continuousEditorType = ContinuousEditorType.COLOR;
editor = new DummyEditor(Object.class, propertyEditor,
continuousEditorType);
+ renderer = mock(TableCellRenderer.class);
}
@Test
Modified: core3/gui-distribution/trunk/features/src/main/resources/features.xml
===================================================================
--- core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-09-25 01:38:11 UTC (rev 30474)
+++ core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-09-25 16:30:39 UTC (rev 30475)
@@ -108,6 +108,7 @@
<bundle
start-level="140">mvn:org.cytoscape/datasource-biogrid-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="140">mvn:org.cytoscape/session-impl/${cytoscape.impl.version}</bundle>
+ <bundle
start-level="140">mvn:org.cytoscape/vizmap-gui-core-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="145">mvn:org.cytoscape/ding-presentation-impl/${cytoscape.impl.version}</bundle>
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-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -88,6 +88,7 @@
import org.cytoscape.view.presentation.property.values.HandleFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualPropertyDependencyFactory;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
import org.cytoscape.view.vizmap.mappings.ValueTranslator;
@@ -159,9 +160,11 @@
applicationManagerServiceRef);
AddEdgeNodeViewTaskFactoryImpl addEdgeNodeViewTaskFactory = new
AddEdgeNodeViewTaskFactoryImpl(vmmServiceRef, cyEventHelperServiceRef);
+ ContinuousMappingCellRendererFactory
continuousMappingCellRendererFactory = getService(bc,
ContinuousMappingCellRendererFactory.class);
+
// Object Position Editor
ObjectPositionValueEditor objectPositionValueEditor = new
ObjectPositionValueEditor();
- ObjectPositionEditor objectPositionEditor = new
ObjectPositionEditor(objectPositionValueEditor);
+ ObjectPositionEditor objectPositionEditor = new
ObjectPositionEditor(objectPositionValueEditor,
continuousMappingCellRendererFactory);
DingViewModelFactory dingNetworkViewFactory = new
DingViewModelFactory(cyDataTableFactoryServiceRef,
cyRootNetworkFactoryServiceRef,
undoSupportServiceRef, spacialIndex2DFactoryServiceRef, dVisualLexicon,
@@ -171,7 +174,7 @@
// Edge Bend editor
EdgeBendValueEditor edgeBendValueEditor = new
EdgeBendValueEditor(cyNetworkFactory, dingNetworkViewFactory,
dingRenderingEngineFactory);
- EdgeBendEditor edgeBendEditor = new
EdgeBendEditor(edgeBendValueEditor);
+ EdgeBendEditor edgeBendEditor = new
EdgeBendEditor(edgeBendValueEditor, continuousMappingCellRendererFactory);
Properties dingRenderingEngineFactoryProps = new Properties();
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/EdgeBendEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -3,12 +3,13 @@
import org.cytoscape.view.presentation.property.values.Bend;
import org.cytoscape.view.vizmap.gui.editor.AbstractVisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
public class EdgeBendEditor extends AbstractVisualPropertyEditor<Bend>{
- public EdgeBendEditor(ValueEditor<Bend> valueEditor) {
- super(Bend.class, new EdgeBendPropertyEditor(valueEditor),
ContinuousEditorType.DISCRETE);
+ public EdgeBendEditor(ValueEditor<Bend> valueEditor,
ContinuousMappingCellRendererFactory cellRendererFactory) {
+ super(Bend.class, new EdgeBendPropertyEditor(valueEditor),
ContinuousEditorType.DISCRETE, cellRendererFactory);
discreteTableCellRenderer = new EdgeBendCellRenderer();
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -5,12 +5,13 @@
import org.cytoscape.ding.ObjectPositionCellRenderer;
import org.cytoscape.view.vizmap.gui.editor.AbstractVisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
public class ObjectPositionEditor extends
AbstractVisualPropertyEditor<ObjectPosition> {
- public ObjectPositionEditor(final ValueEditor<ObjectPosition>
valueEditor) {
- super(ObjectPosition.class, new
CyObjectPositionPropertyEditor(valueEditor), ContinuousEditorType.DISCRETE);
+ public ObjectPositionEditor(final ValueEditor<ObjectPosition>
valueEditor, ContinuousMappingCellRendererFactory cellRendererFactory) {
+ super(ObjectPosition.class, new
CyObjectPositionPropertyEditor(valueEditor), ContinuousEditorType.DISCRETE,
cellRendererFactory);
discreteTableCellRenderer = new ObjectPositionCellRenderer();
Modified: core3/impl/trunk/pom.xml
===================================================================
--- core3/impl/trunk/pom.xml 2012-09-25 01:38:11 UTC (rev 30474)
+++ core3/impl/trunk/pom.xml 2012-09-25 16:30:39 UTC (rev 30475)
@@ -56,6 +56,7 @@
<module>table-browser-impl</module>
<module>table-import-impl</module>
<module>viewmodel-impl</module>
+ <module>vizmap-gui-core-impl</module>
<module>vizmap-gui-impl</module>
<module>vizmap-impl</module>
<module>webservice-biomart-client-impl</module>
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -203,6 +203,7 @@
mavenBundle().groupId("org.cytoscape").artifactId("session-impl").version(implBundleVersion).startLevel(19),
+
mavenBundle().groupId("org.cytoscape").artifactId("vizmap-gui-core-impl").version(implBundleVersion).startLevel(20),
mavenBundle().groupId("org.cytoscape").artifactId("ding-presentation-impl").version(implBundleVersion).startLevel(21),
mavenBundle().groupId("org.cytoscape").artifactId("io-impl").version(implBundleVersion).startLevel(23),
Added: core3/impl/trunk/vizmap-gui-core-impl/pom.xml
===================================================================
--- core3/impl/trunk/vizmap-gui-core-impl/pom.xml
(rev 0)
+++ core3/impl/trunk/vizmap-gui-core-impl/pom.xml 2012-09-25 16:30:39 UTC
(rev 30475)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <artifactId>impl-parent</artifactId>
+ <groupId>org.cytoscape</groupId>
+ <version>3.0.0-alpha10-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+
<bundle.symbolicName>org.cytoscape.vizmap-gui-core-impl</bundle.symbolicName>
+
<bundle.namespace>org.cytoscape.view.vizmap.gui.core</bundle.namespace>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>vizmap-gui-core-impl</artifactId>
+
+ <name>Cytoscape VizMap GUI Core Impl (${project.artifactId})</name>
+
+ <packaging>bundle</packaging>
+
+
+ <repositories>
+ <repository>
+ <id>cytoscape_snapshots</id>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <name>Cytoscape Snapshots</name>
+
<url>http://code.cytoscape.org/nexus/content/repositories/snapshots/</url>
+ </repository>
+ <repository>
+ <id>cytoscape_releases</id>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <name>Cytoscape Releases</name>
+
<url>http://code.cytoscape.org/nexus/content/repositories/releases/</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+
<version>${maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
+
<Bundle-Version>${project.version}</Bundle-Version>
+
<Export-Package>!${bundle.namespace}.*</Export-Package>
+
<Private-Package>${bundle.namespace}.*</Private-Package>
+
<Bundle-Activator>${bundle.namespace}.internal.CyActivator</Bundle-Activator>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <!-- Cytoscape Dependency -->
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>vizmap-gui-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>l2fprod-common-sheet</artifactId>
+ <version>7.3</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>l2fprod-common-shared</artifactId>
+ <version>7.3</version>
+ </dependency>
+ <dependency>
+ <groupId>cytoscape-temp</groupId>
+ <artifactId>l2fprod-common-fontchooser</artifactId>
+ <version>7.3</version>
+ </dependency>
+ </dependencies>
+</project>
Property changes on: core3/impl/trunk/vizmap-gui-core-impl/pom.xml
___________________________________________________________________
Added: svn:executable
+ *
Added:
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/CyActivator.java
(rev 0)
+++
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/CyActivator.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -0,0 +1,18 @@
+package org.cytoscape.view.vizmap.gui.core.internal;
+
+import java.util.Properties;
+
+import org.cytoscape.service.util.AbstractCyActivator;
+import
org.cytoscape.view.vizmap.gui.core.internal.cellrenderer.ContinuousMappingCellRendererFactoryImpl;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
+import org.osgi.framework.BundleContext;
+
+public class CyActivator extends AbstractCyActivator {
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ ContinuousMappingCellRendererFactory
continuousMappingCellRendererFactoryImpl = new
ContinuousMappingCellRendererFactoryImpl();
+ registerService(context,
continuousMappingCellRendererFactoryImpl,
ContinuousMappingCellRendererFactory.class, new Properties());
+ }
+
+}
Added:
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRenderer.java
===================================================================
---
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRenderer.java
(rev 0)
+++
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRenderer.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -0,0 +1,50 @@
+package org.cytoscape.view.vizmap.gui.core.internal.cellrenderer;
+
+import java.awt.Component;
+
+import javax.swing.ImageIcon;
+import javax.swing.JTable;
+
+import org.cytoscape.view.vizmap.gui.editor.ContinuousMappingEditor;
+import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
+
+import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
+
+public final class ContinuousMappingCellRenderer extends DefaultCellRenderer {
+
+ private static final long serialVersionUID = -6734053848878359286L;
+
+ private final ContinuousMappingEditor<?, ?> editor;
+
+ public ContinuousMappingCellRenderer(final ContinuousMappingEditor<?,
?> editor) {
+ if (editor == null)
+ throw new NullPointerException("Editor object is
null.");
+
+ this.editor = editor;
+ }
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object
value, boolean isSelected, boolean hasFocus,
+ int row, int column) {
+
+ if (value == null || value instanceof ContinuousMapping ==
false) {
+ this.setText("Unkonown Mapping");
+ return this;
+ }
+
+ if (isSelected) {
+ setBackground(table.getSelectionBackground());
+ setForeground(table.getSelectionForeground());
+ } else {
+ setBackground(table.getBackground());
+ setForeground(table.getForeground());
+ }
+
+ final int height = table.getRowHeight(row);
+ final int width =
table.getColumnModel().getColumn(column).getWidth();
+ final ImageIcon icon = editor.drawIcon(width, height - 2,
false);
+ this.setIcon(icon);
+
+ return this;
+ }
+}
Added:
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRendererFactoryImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRendererFactoryImpl.java
(rev 0)
+++
core3/impl/trunk/vizmap-gui-core-impl/src/main/java/org/cytoscape/view/vizmap/gui/core/internal/cellrenderer/ContinuousMappingCellRendererFactoryImpl.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -0,0 +1,14 @@
+package org.cytoscape.view.vizmap.gui.core.internal.cellrenderer;
+
+import javax.swing.table.TableCellRenderer;
+
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
+import org.cytoscape.view.vizmap.gui.editor.ContinuousMappingEditor;
+
+public class ContinuousMappingCellRendererFactoryImpl implements
ContinuousMappingCellRendererFactory {
+
+ @Override
+ public TableCellRenderer
createTableCellRenderer(ContinuousMappingEditor<? extends Number, ?> editor) {
+ return new ContinuousMappingCellRenderer(editor);
+ }
+}
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
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -27,6 +27,7 @@
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
import org.cytoscape.view.vizmap.gui.editor.VisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.internal.action.EditSelectedCellAction;
@@ -98,7 +99,8 @@
VisualMappingFunctionFactory continousMappingFactory =
getService(bc, VisualMappingFunctionFactory.class, "(mapping.type=continuous)");
AttributeSetManager attributeSetManager = new
AttributeSetManager(cyNetworkTableManagerServiceRef);
- EditorManagerImpl editorManager = new
EditorManagerImpl(cyApplicationManagerServiceRef,attributeSetManager,vmmServiceRef,cyNetworkTableManagerServiceRef,
cyNetworkManagerServiceRef, continousMappingFactory);
+ ContinuousMappingCellRendererFactory
continuousMappingCellRendererFactory =
getService(bc,ContinuousMappingCellRendererFactory.class);
+ EditorManagerImpl editorManager = new
EditorManagerImpl(cyApplicationManagerServiceRef,attributeSetManager,vmmServiceRef,cyNetworkTableManagerServiceRef,
cyNetworkManagerServiceRef, continousMappingFactory,
continuousMappingCellRendererFactory);
MappingFunctionFactoryManagerImpl mappingFunctionFactoryManager
= new MappingFunctionFactoryManagerImpl(editorManager);
PropertySheetPanel propertySheetPanel = new
PropertySheetPanel();
@@ -114,16 +116,16 @@
StringValueEditor stringValueEditor = new StringValueEditor();
BooleanValueEditor booleanValueEditor = new
BooleanValueEditor();
- ColorVisualPropertyEditor colorPropertyEditor = new
ColorVisualPropertyEditor(Paint.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef,
cyColorPropertyEditor);
- NumberVisualPropertyEditor doublePropertyEditor = new
NumberVisualPropertyEditor(Double.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef);
- NumberVisualPropertyEditor integerPropertyEditor = new
NumberVisualPropertyEditor(Integer.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef);
- NumberVisualPropertyEditor floatPropertyEditor = new
NumberVisualPropertyEditor(Float.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef);
+ ColorVisualPropertyEditor colorPropertyEditor = new
ColorVisualPropertyEditor(Paint.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef,
cyColorPropertyEditor, continuousMappingCellRendererFactory);
+ NumberVisualPropertyEditor doublePropertyEditor = new
NumberVisualPropertyEditor(Double.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef,
continuousMappingCellRendererFactory);
+ NumberVisualPropertyEditor integerPropertyEditor = new
NumberVisualPropertyEditor(Integer.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef,
continuousMappingCellRendererFactory);
+ NumberVisualPropertyEditor floatPropertyEditor = new
NumberVisualPropertyEditor(Float.class,cyNetworkTableManagerServiceRef,cyApplicationManagerServiceRef,editorManager,vmmServiceRef,
continuousMappingCellRendererFactory);
- FontVisualPropertyEditor fontVisualPropertyEditor = new
FontVisualPropertyEditor(Font.class, fontPropertyEditor);
- StringVisualPropertyEditor stringPropertyEditor = new
StringVisualPropertyEditor();
+ FontVisualPropertyEditor fontVisualPropertyEditor = new
FontVisualPropertyEditor(Font.class, fontPropertyEditor,
continuousMappingCellRendererFactory);
+ StringVisualPropertyEditor stringPropertyEditor = new
StringVisualPropertyEditor(continuousMappingCellRendererFactory);
final CyComboBoxPropertyEditor booleanEditor = new
CyComboBoxPropertyEditor();
booleanEditor.setAvailableValues(new Boolean[] {true, false});
- BooleanVisualPropertyEditor booleanVisualPropertyEditor = new
BooleanVisualPropertyEditor(booleanEditor);
+ BooleanVisualPropertyEditor booleanVisualPropertyEditor = new
BooleanVisualPropertyEditor(booleanEditor,
continuousMappingCellRendererFactory);
ColorManager colorMgr = new ColorManager();
IconManager iconManager = new IconManager();
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/BasicVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/BasicVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/BasicVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -4,6 +4,7 @@
import org.cytoscape.view.vizmap.gui.editor.AbstractVisualPropertyEditor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import com.l2fprod.common.propertysheet.PropertyRendererRegistry;
@@ -20,7 +21,7 @@
REG.registerDefaults();
}
- public BasicVisualPropertyEditor(Class<T> type, PropertyEditor
propertyEditor, ContinuousEditorType editorType) {
- super(type, propertyEditor, editorType);
+ public BasicVisualPropertyEditor(Class<T> type, PropertyEditor
propertyEditor, ContinuousEditorType editorType,
ContinuousMappingCellRendererFactory cellRendererFactory) {
+ super(type, propertyEditor, editorType, cellRendererFactory);
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/BooleanVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/BooleanVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/BooleanVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -3,11 +3,12 @@
import java.beans.PropertyEditor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
public class BooleanVisualPropertyEditor extends
BasicVisualPropertyEditor<Boolean> {
- public BooleanVisualPropertyEditor(final PropertyEditor editor) {
- super(Boolean.class, editor, ContinuousEditorType.DISCRETE);
+ public BooleanVisualPropertyEditor(final PropertyEditor editor,
ContinuousMappingCellRendererFactory cellRendererFactory) {
+ super(Boolean.class, editor, ContinuousEditorType.DISCRETE,
cellRendererFactory);
discreteTableCellRenderer = REG.getRenderer(Boolean.class);
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -41,6 +41,7 @@
import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyColorPropertyEditor;
@@ -53,10 +54,11 @@
/**
* Constructor. Should instantiate one editor per VisualProperty.
+ * @param cellRendererFactory
*/
public ColorVisualPropertyEditor(final Class<Paint> type, final
CyNetworkTableManager manager,
- final CyApplicationManager appManager, final
EditorManager editorManager, final VisualMappingManager vmm, final
CyColorPropertyEditor colorPropEditor) {
- super(type, colorPropEditor, ContinuousEditorType.COLOR);
+ final CyApplicationManager appManager, final
EditorManager editorManager, final VisualMappingManager vmm, final
CyColorPropertyEditor colorPropEditor, ContinuousMappingCellRendererFactory
cellRendererFactory) {
+ super(type, colorPropEditor, ContinuousEditorType.COLOR,
cellRendererFactory);
this.discreteTableCellRenderer = REG.getRenderer(Color.class);
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/CustomGraphicsVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/CustomGraphicsVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/CustomGraphicsVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -2,13 +2,14 @@
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.FontTableCellRenderer;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyFontPropertyEditor;
public class CustomGraphicsVisualPropertyEditor extends
BasicVisualPropertyEditor<CyCustomGraphics<?>> {
- public CustomGraphicsVisualPropertyEditor(Class<CyCustomGraphics<?>>
type, CyFontPropertyEditor fontPropEditor) {
- super(type, fontPropEditor, ContinuousEditorType.DISCRETE);
+ public CustomGraphicsVisualPropertyEditor(Class<CyCustomGraphics<?>>
type, CyFontPropertyEditor fontPropEditor, ContinuousMappingCellRendererFactory
cellRendererFactory) {
+ super(type, fontPropEditor, ContinuousEditorType.DISCRETE,
cellRendererFactory);
discreteTableCellRenderer = new FontTableCellRenderer();
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValueVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValueVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValueVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -1,6 +1,7 @@
package org.cytoscape.view.vizmap.gui.internal.editor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.internal.cellrenderer.IconCellRenderer;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyDiscreteValuePropertyEditor;
@@ -14,8 +15,8 @@
public class DiscreteValueVisualPropertyEditor<T> extends
BasicVisualPropertyEditor<T> {
public DiscreteValueVisualPropertyEditor(final Class<T> type, final
IconCellRenderer<T> cellRenderer,
- final CyDiscreteValuePropertyEditor<T> propEditor) {
- super(type, propEditor, ContinuousEditorType.DISCRETE);
+ final CyDiscreteValuePropertyEditor<T> propEditor,
ContinuousMappingCellRendererFactory cellRendererFactory) {
+ super(type, propEditor, ContinuousEditorType.DISCRETE,
cellRendererFactory);
if(cellRenderer != null)
discreteTableCellRenderer = cellRenderer;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -64,6 +64,7 @@
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import org.cytoscape.view.vizmap.gui.editor.ListEditor;
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
@@ -107,17 +108,21 @@
private final VisualMappingManager vmm;
private final VisualMappingFunctionFactory continuousMappingFactory;
+ private ContinuousMappingCellRendererFactory cellRendererFactory;
+
/**
* Creates a new EditorFactory object.
+ * @param cellRendererFactory
*/
public EditorManagerImpl(final CyApplicationManager appManager, final
AttributeSetManager attrManager,
final VisualMappingManager vmm, final
CyNetworkTableManager tableManager,
- final CyNetworkManager networkManager,
VisualMappingFunctionFactory continuousMappingFactory) {
+ final CyNetworkManager networkManager,
VisualMappingFunctionFactory continuousMappingFactory,
ContinuousMappingCellRendererFactory cellRendererFactory) {
this.appManager = appManager;
this.tableManager = tableManager;
this.vmm = vmm;
this.continuousMappingFactory = continuousMappingFactory;
+ this.cellRendererFactory = cellRendererFactory;
editors = new HashMap<Class<?>, VisualPropertyEditor<?>>();
@@ -308,7 +313,7 @@
(DiscreteValueEditor)
this.getValueEditor(range.getType()));
final VisualPropertyEditor<?> vpEditor = new
DiscreteValueVisualPropertyEditor(range.getType(),
- null, discretePropEditor);
+ null, discretePropEditor,
cellRendererFactory);
this.addVisualPropertyEditor(vpEditor, null);
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/FontVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -3,12 +3,13 @@
import java.awt.Font;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.FontTableCellRenderer;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyFontPropertyEditor;
public class FontVisualPropertyEditor extends BasicVisualPropertyEditor<Font> {
- public FontVisualPropertyEditor(Class<Font> type, CyFontPropertyEditor
fontPropEditor) {
- super(type, fontPropEditor, ContinuousEditorType.DISCRETE);
+ public FontVisualPropertyEditor(Class<Font> type, CyFontPropertyEditor
fontPropEditor, ContinuousMappingCellRendererFactory cellRendererFactory) {
+ super(type, fontPropEditor, ContinuousEditorType.DISCRETE,
cellRendererFactory);
discreteTableCellRenderer = new FontTableCellRenderer();
}
}
\ No newline at end of file
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
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -40,6 +40,7 @@
import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import org.cytoscape.view.vizmap.gui.editor.ContinuousMappingEditor;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.NumberContinuousCellRenderer;
@@ -49,10 +50,11 @@
/**
* Creates a new DiscreteNumber object.
+ * @param cellRendererFactory
*/
public NumberVisualPropertyEditor(Class<T> type, final
CyNetworkTableManager manager,
- final CyApplicationManager appManager, final
EditorManager editorManager, final VisualMappingManager vmm) {
- super(type, new CyNumberPropertyEditor<T>(type, null),
ContinuousEditorType.CONTINUOUS);
+ final CyApplicationManager appManager, final
EditorManager editorManager, final VisualMappingManager vmm,
ContinuousMappingCellRendererFactory cellRendererFactory) {
+ super(type, new CyNumberPropertyEditor<T>(type, null),
ContinuousEditorType.CONTINUOUS, cellRendererFactory);
discreteTableCellRenderer = REG.getRenderer(type);
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/StringVisualPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/StringVisualPropertyEditor.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/StringVisualPropertyEditor.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -1,12 +1,13 @@
package org.cytoscape.view.vizmap.gui.internal.editor;
import org.cytoscape.view.vizmap.gui.editor.ContinuousEditorType;
+import
org.cytoscape.view.vizmap.gui.editor.ContinuousMappingCellRendererFactory;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyStringPropertyEditor;
public class StringVisualPropertyEditor extends
BasicVisualPropertyEditor<String> {
- public StringVisualPropertyEditor() {
- super(String.class, new CyStringPropertyEditor(),
ContinuousEditorType.DISCRETE);
+ public StringVisualPropertyEditor(ContinuousMappingCellRendererFactory
cellRendererFactory) {
+ super(String.class, new CyStringPropertyEditor(),
ContinuousEditorType.DISCRETE, cellRendererFactory);
discreteTableCellRenderer = REG.getRenderer(String.class);
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2012-09-25 01:38:11 UTC (rev 30474)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2012-09-25 16:30:39 UTC (rev 30475)
@@ -41,6 +41,7 @@
import java.awt.event.WindowEvent;
import java.awt.event.WindowListener;
import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeListener;
import java.util.Iterator;
import java.util.List;
import java.util.SortedMap;
@@ -48,6 +49,7 @@
import java.util.TreeMap;
import java.util.TreeSet;
+import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.GroupLayout;
--
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.
