Author: kono
Date: 2010-10-26 13:24:47 -0700 (Tue, 26 Oct 2010)
New Revision: 22472

Added:
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/package-info.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/package-info.java
   
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
Removed:
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsEvent.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsListener.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyEvent.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyListener.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedEvent.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedListener.java
Modified:
   core3/vizmap-api/trunk/pom.xml
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunctionFactory.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyle.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleFactory.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedEvent.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedListener.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedListener.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
   
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedListener.java
   
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
   
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
   
cytoscape3/trunk/application/src/main/java/cytoscape/internal/dialogs/PreferencesDialogImpl.java
Log:
vizmap-api bundle cleaned up.  Tests and documents had been added.

Modified: core3/vizmap-api/trunk/pom.xml
===================================================================
--- core3/vizmap-api/trunk/pom.xml      2010-10-26 20:21:37 UTC (rev 22471)
+++ core3/vizmap-api/trunk/pom.xml      2010-10-26 20:24:47 UTC (rev 22472)
@@ -135,6 +135,12 @@
                        <scope>test</scope>
                </dependency>
                <dependency>
+                       <groupId>org.easymock</groupId>
+                       <artifactId>easymock</artifactId>
+                       <version>${easymock.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
                        <groupId>org.cytoscape</groupId>
                        <artifactId>presentation-api</artifactId>
                        <version>1.0-SNAPSHOT</version>

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
   2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunction.java
   2010-10-26 20:24:47 UTC (rev 22472)
@@ -31,73 +31,73 @@
  You should have received a copy of the GNU Lesser General Public License
  along with this library; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
 package org.cytoscape.view.vizmap;
 
 import org.cytoscape.model.CyTableEntry;
 import org.cytoscape.view.model.View;
 import org.cytoscape.view.model.VisualProperty;
 
-
 /**
  * This class defines how an attribute gets mapped to a visual property.<br />
  * 
  * It takes two values:
  * <ul>
- *  <li>Attribute value: node name(Strings), expression values(Numbers), 
...</li>
- *  <li>Visual Property: node size(Numbers), edge color(Color), node 
shape(NodeShape), ...</li>
+ * <li>Attribute value: node name(Strings), expression values(Numbers), 
...</li>
+ * <li>Visual Property: node size(Numbers), edge color(Color), node
+ * shape(NodeShape), ...</li>
  * </ul>
  * 
- * This provides the mapping function from converting the attribute to the 
visual
- * property.  Essentially, this is a map using <K> as the key and <V> as the 
value.
- *
- * The direction of mapping is ALWAYS:<br />
+ * This provides the mapping function from converting the attribute to the
+ * visual property. Essentially, this is a map using <K> as the key and <V> as
+ * the value.
  * 
+ * The direction of mapping is ALWAYS:
+ * 
+ * <p>
  * K(Attribute) ---> V(Visual Property)
+ * </p>
  * 
  * K will be used in implementations.
  * 
- * @param <K> Attribute value object type.  This is the key of this mapping 
(Can be any objects)
- * @param <V> Visual property value type. (can be any type)
+ * @param <K>
+ *            Attribute object type. This is the key of mapping (Can
+ *            be any objects)
+ * @param <V>
+ *            Visual property value type. (can be any type)
  * 
  */
 public interface VisualMappingFunction<K, V> {
-       
-               
+
        /**
-        *  Returns attribute name used in this mapping.
-        *  This field is immutable.
-        *
-        * @return  DOCUMENT ME!
+        * Returns attribute name used in this mapping. This field is immutable.
+        * 
+        * @return name of attribute (a column name in data table) associated 
with
+        *         this mapping.
         */
        String getMappingAttributeName();
-       
-       
+
        /**
         * Returns data type of mapping attribute.
         * 
-        * @return
+        * @return data type of controlling attribute.
         */
        Class<K> getMappingAttributeType();
 
-       
        /**
-        *  Visual Property associated with this function.
-        *  This field is immutable.
-        *
-        * @return  DOCUMENT ME!
+        * Visual Property associated with this function. This field is 
immutable.
+        * 
+        * @return {...@linkplain VisualProperty} used in this mapping.
         */
        VisualProperty<V> getVisualProperty();
 
-       
        /**
-        *  Since current MappingFunctions map from Attributes to
-        *  VisualProperties, have to restrict View<?> to those
-        *  generic types that have CyAttributes; currently this is
-        *  CyTableEntry.
+        * Apply mapping to the view model. Once this method is called, 
Cytoscape
+        * updates the view model and fires proper events.
         * 
-        * @param column DOCUMENT ME!
-        * @param views DOCUMENT ME!
+        * @param view
+        *            target View model to be updated. View should be one of the
+        *            following: Node, Edge, or Network.
         */
        void apply(final View<? extends CyTableEntry> view);
 }

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunctionFactory.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunctionFactory.java
    2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingFunctionFactory.java
    2010-10-26 20:24:47 UTC (rev 22472)
@@ -2,18 +2,26 @@
 
 import org.cytoscape.view.model.VisualProperty;
 
+/**
+ * Factory for {...@linkplain VisualMappingFunction}s. Implementation of this 
will
+ * be provided as an service.  One mapping type should have one factory.
+ * 
+ */
 public interface VisualMappingFunctionFactory {
-       
+
        /**
-        * Create a new VisualMapping Function.
+        * Create a new {...@linkplain VisualMappingFunction}.
         * 
-        * @param <K>
-        * @param <V>
-        * @param functionType
-        * @param attrValueType
-        * @param attributeName
-        * @param vp
-        * @return
+        * @param <K> Data type of controlling attribute.
+        * @param <V> Data type of {...@linkplain VisualProperty}, such as 
{...@linkplain Color}, {...@linkplain String}, etc.
+        * 
+        * @param attributeName Controlling attribute name.  This is a name of 
the column in a data table.
+        * @param attrValueType Data type of controlling attribute.
+        * @param vp {...@linkplain VisualProperty} used in the new mapping
+        * 
+        * @return new VisualMappingFunction.
         */
-       <K, V> VisualMappingFunction<K, V> createVisualMappingFunction(final 
String attributeName, final Class<K> attrValueType, final VisualProperty<V> vp);
+       <K, V> VisualMappingFunction<K, V> createVisualMappingFunction(
+                       final String attributeName, final Class<K> 
attrValueType,
+                       final VisualProperty<V> vp);
 }

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
    2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
    2010-10-26 20:24:47 UTC (rev 22472)
@@ -1,4 +1,3 @@
-
 /*
  Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
 
@@ -32,70 +31,57 @@
  You should have received a copy of the GNU Lesser General Public License
  along with this library; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
 
 package org.cytoscape.view.vizmap;
 
+import java.util.Properties;
 import java.util.Set;
 
 import org.cytoscape.view.model.CyNetworkView;
 
-
 /**
- * Managing mapping from View --> Visual Style.
- * Also, this class manages list of all available Visual Styles.
- * Creation/deletion of VS is a function of this class.  
- *
- * @author abeld
- * @author kono
+ * Manager for {...@linkplain Visual Style}s. This object manages mapping from 
view
+ * model to VisualStyle. User objects can access all VisualStyles and
+ * VisualMappingFunctions through this class.
  * 
- * @since Cytoscape 3.0
- *
+ * <p>
+ * Add/Remove operations will be done through events. For more information, 
read
+ * JavaDoc for {...@linkplain VisualStyleCreatedEvent} and
+ * {...@linkplain VisualStyleDestroyedEvent}.
+ * </p>
+ * 
  */
 public interface VisualMappingManager {
-       
+
        /**
-        *  Set a Visual Style to the target view
-        *
-        * @param vs Visual Style to be set.
-        * @param nv Target network view
+        * Set a {...@linkplain VisualStyle} to the target network view model.
+        * 
+        * @param vs
+        *            Visual Style to be set.
+        * @param nv
+        *            Target network view
         */
-       void setVisualStyle(final VisualStyle visualStyle, final CyNetworkView 
networkViewModel);
-       
+       void setVisualStyle(final VisualStyle visualStyle,
+                       final CyNetworkView networkViewModel);
 
        /**
-        *  Returns the associated Visual Style for the target view.
-        *
-        * @param nv Target network view
-        *
-        * @return  Associated Visual Style for the view.
+        * Returns the {...@linkplain VisualStyle} associated with the target 
network
+        * view model.
+        * 
+        * @param networkViewModel
+        *            Target network view
+        * 
+        * @return VisualStyle associated with the network view model.
         */
        VisualStyle getVisualStyle(final CyNetworkView networkViewModel);
 
-
        /**
-        * Returns all available Visual Styles managed by this object.
-        *
-        * @return Collection of all available Visual Styles.
+        * Returns all available {...@linkplain VisualStyle}s managed by this 
object.
         * 
-        */
-       Set<VisualStyle> getAllVisualStyles();
-       
-       
-       /**
-        * Add a new style to manager
-        *
-        * @param vs
-        */
-       void addVisualStyle(final VisualStyle visualStyle);
-       
-       
-       /**
-        * Remove a Visual Style.
-        *
-        * @param vs Visual Style to be removed.
+        * @return Set of all registered VisualStyles.
         * 
         */
-       void removeVisualStyle(final VisualStyle visualStyle);
+       Set<VisualStyle> getAllVisualStyles();
 
 }

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyle.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyle.java 
    2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyle.java 
    2010-10-26 20:24:47 UTC (rev 22472)
@@ -42,8 +42,8 @@
 
 
 /**
- * A VisualStyle is a collection of VisualMappingFunctions and default values
- * that defines how a set of attributes modify visual properties of a View 
object.
+ * A VisualStyle is a collection of {...@linkplain VisualMappingFunction}s and 
default values
+ * that define how a set of attributes is mapped to visual properties of View 
objects.
  *
  */
 public interface VisualStyle {
@@ -52,7 +52,8 @@
         * Returns name of this visual style. This should NOT be used as the ID 
of this
         * Visual Style. Just for GUI components and may not be unique.
         * 
-        * Title of Visual Style is a mutable field.
+        * <p>
+        * Title of Visual Style is a mutable field and may 
<strong>NOT</strong> be unique.
         *
         * @return title of this visual style
         */
@@ -60,88 +61,92 @@
 
        
        /**
-        * Set new title of this VS.
-        * Will be used by rename function.
+        * Set new title for this VisualStyle.
         *
-        * @param title New title.
+        * @param title New title of this VisualStyle.
         */
        void setTitle(final String title);
        
 
        /**
-        * Add a new mapping for this Visual Style.
+        * Add a new {...@linkplain VisualMappingFunction} to this VisualStyle.
         *
-        * @param mapping new mapping.
+        * @param mapping new VisualMappingFunction to be added.
         */
        void addVisualMappingFunction(final VisualMappingFunction<?, ?> 
mapping);
        
        
        /**
-        *  Remove a mapping for Visual Property.
+        *  Remove a VisualMappingFunction for the VisualProperty.
         *  One visual property can be associated with only one mapping 
function, 
-        *  so this always removes correct mapping.
+        *  so this always removes correct one.
         *
-        * @param vp mapping associated with this vp will be removed.
+        * @param vp VisualMappingFunction associated with this VisualProperty 
will be removed.
         *
         */
        void removeVisualMappingFunction(final VisualProperty<?> vp);
 
        
        /**
-        *  get current mapping for the Visual Property vp.
+        *  Get current {...@linkplain VisualMappingFunction} for the 
VisualProperty.
         *
-        * @param <V> Type of visual property.
+        * @param <V> Data type of VisualProperty.
+        * 
         * @param vp visual property associated with the target mapping.
         *
-        * @return mapping function for vp
+        * @return mapping function for the VisualProperty.  If no mapping is 
available, this value is null.
         * 
         */
        <V> VisualMappingFunction<?, V> getVisualMappingFunction(final 
VisualProperty<V> vp);
 
        
        /**
-        *  Returns all available mappings.
+        *  Returns all {...@linkplain VisualMappingFunction}s in this style.
         *
-        * @return  All visual mappings for this style.
+        * @return  All mappings for this style.
         */
        Collection<VisualMappingFunction<?, ?>> getAllVisualMappingFunctions();
 
        
        /**
-        *  Returns default value for the Visual Property vp.
-        *  This is style's default value.  Not same as VP's default.
+        *  Returns default value for the VisualProperty.
+        *  This is style's default value, not same as VisualProperty default.
+        *  If VisualMappingFunction is not available for this VisualProperty, 
this default value will be used in the view model.
         *
-        * @param <V> Type of object associated with vp
-        * @param vp target visual property
+        * @param <V> Data type of VisualProperty
+        * 
+        * @param vp target VisualProperty
         *
-        * @return  Style's default value for vp
+        * @return  Style's default value for the VisualProperty.
         */
        <V> V getDefaultValue(final VisualProperty<V> vp);
 
        
        /**
-        *  Setter for the default value of vp.
+        *  Set default value for the VisualProperty.
         *
-        * @param <V> Type of object associated with vp
-        * @param vp target visual property
+        * @param <V> Data type of VisualProperty
+        * @param <S> Data type of actual default value.  This can be same as V 
or its child classes.
+        * 
+        * @param vp target VisualProperty
         * @param value Value to be set as default.  This can be child type of 
V.  For example, 
         *                              if V is Number, S can be Double, 
Integer, etc.
         */
-       <V, S extends V> void setDefaultValue(final VisualProperty<V> vp, S 
value);
+       <V, S extends V> void setDefaultValue(final VisualProperty<V> vp, final 
S value);
 
        
        /**
-        * Apply this visual style to the view.
-        * Currently this is only for network view.
-        *
-        * @param v Visual Style will be applied to this network view.
+        * Apply this style to the network view model.
+        * 
+        * @param networkViewModel target view model to be updated.
         */
        void apply(final CyNetworkView networkViewModel);
        
        
        /**
-        * A Visual Style is always associated with a lexicon tree provided 
-        * by a rendering engine.  This method returns its associated lexicon.
+        * A VisualStyle is always associated with a lexicon tree provided 
+        * by a {...@linkplain RenderingEngine}.  This method returns the 
associated lexicon.
+        * VisualLexicon is immutable.
         * 
         * @return VisualLexicon provided by a rendering engine.
         */

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleFactory.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleFactory.java
      2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/VisualStyleFactory.java
      2010-10-26 20:24:47 UTC (rev 22472)
@@ -2,27 +2,33 @@
 
 import org.cytoscape.view.model.VisualLexicon;
 
+/**
+ * Factory for {...@linkplain VisualStyle}s.  This object will be provided as 
an OSGi service.
+ *
+ */
 public interface VisualStyleFactory {
        
        /**
-        * Create a new Visual Style.
+        * Create a new {...@linkplain VisualStyle}.
         * 
         * @param title Title of the visual style.  This can be null, but in 
that case, 
         *                                      default title will be used.
         *                      Note: This is NOT an identifier of this object, 
just a title.
+        * @param lexicon VisualLexicon for the new style.
         *
-        * @return New Visual Style
+        * @return New VisualStyle object.
         */
        VisualStyle createVisualStyle(final String title, final VisualLexicon 
lexicon);
        
        
        /**
-        * Create a copy of given Visual Style.
+        * Create a copy of given {...@linkplain VisualStyle}.
         *
         * @param original
-        *            VS to be copied from.
+        *            VisualStyle to be copied from.
         *
-        * @return Copied VS
+        * @return New VisualStyle copied from the original.
+        * 
         */
        VisualStyle createVisualStyle(final VisualStyle original);
 

Deleted: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsEvent.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsEvent.java
     2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsEvent.java
     2010-10-26 20:24:47 UTC (rev 22472)
@@ -1,13 +0,0 @@
-
-package org.cytoscape.view.vizmap.events;
-
-import org.cytoscape.event.AbstractCyEvent;
-
-/**
- * 
- */
-public final class SaveVizmapPropsEvent extends AbstractCyEvent<Object> {
-       public SaveVizmapPropsEvent(final Object source) {
-               super(source, SaveVizmapPropsListener.class);
-       }
-}

Deleted: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsListener.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsListener.java
  2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/SaveVizmapPropsListener.java
  2010-10-26 20:24:47 UTC (rev 22472)
@@ -1,11 +0,0 @@
-
-package org.cytoscape.view.vizmap.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * 
- */
-public interface SaveVizmapPropsListener extends CyListener {
-       public void handleEvent(SaveVizmapPropsEvent e);
-}

Deleted: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyEvent.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyEvent.java
   2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyEvent.java
   2010-10-26 20:24:47 UTC (rev 22472)
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications.  In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage.  See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-package org.cytoscape.view.vizmap.events;
-
-import org.cytoscape.event.AbstractCyEvent;
-
-import org.cytoscape.view.vizmap.VisualStyle;
-
-
-/**
- * DOCUMENT ME!
-  */
-public final class VisualStyleAboutToDestroyEvent extends 
AbstractCyEvent<VisualStyle> {
-       public VisualStyleAboutToDestroyEvent(final VisualStyle source) {
-               super(source, VisualStyleAboutToDestroyListener.class);
-       }
-}

Deleted: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyListener.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyListener.java
        2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleAboutToDestroyListener.java
        2010-10-26 20:24:47 UTC (rev 22472)
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications.  In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage.  See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-package org.cytoscape.view.vizmap.events;
-
-import org.cytoscape.event.CyListener;
-
-
-/**
- * Listener for VisualStyleAboutToDestroyEvent.
- */
-public interface VisualStyleAboutToDestroyListener extends CyListener {
-       /**
-        * DOCUMENT ME!
-        * @param e DOCUMENT ME!
-        */
-       void handleEvent(VisualStyleAboutToDestroyEvent e);
-}

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedEvent.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedEvent.java
  2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedEvent.java
  2010-10-26 20:24:47 UTC (rev 22472)
@@ -40,9 +40,11 @@
 
 
 /**
- * DOCUMENT ME!
+ * TODO: Is this necessary?
+ * 
   */
 public final class VisualStyleChangedEvent extends 
AbstractCyEvent<VisualStyle> {
+       
        public VisualStyleChangedEvent(final VisualStyle source) {
                super(source, VisualStyleChangedListener.class);
        }

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedListener.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedListener.java
       2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleChangedListener.java
       2010-10-26 20:24:47 UTC (rev 22472)
@@ -42,7 +42,8 @@
  */
 public interface VisualStyleChangedListener extends CyListener {
        /**
-        * DOCUMENT ME!
+        * TODO: is this necessary?
+        * 
         * @param e DOCUMENT ME!
         */
        void handleEvent(VisualStyleChangedEvent e);

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
  2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedEvent.java
  2010-10-26 20:24:47 UTC (rev 22472)
@@ -38,19 +38,30 @@
 import org.cytoscape.view.vizmap.VisualStyle;
 
 /**
- * DOCUMENT ME!
+ * When {...@linkplain VisualStyleFactory} creates a new {...@linkplain 
VisualStyle}
+ * object, it should fire this event.
+ * 
  */
 public final class VisualStyleCreatedEvent extends AbstractCyEvent<Object> {
 
        private final VisualStyle created;
 
-       public VisualStyleCreatedEvent(final Object source, final VisualStyle 
created) {
+       /**
+        * Creates an event for the newly created style.
+        * 
+        * @param source this is usually the {...@linkplain VisualStyleFactory}.
+        * @param created the new VisualStyle
+        */
+       public VisualStyleCreatedEvent(final Object source,
+                       final VisualStyle created) {
                super(source, VisualStyleCreatedListener.class);
                this.created = created;
        }
+
        /**
-        * Get the newly created Visual Style by the Visual Mapping Manager.
-        * @return
+        * Get the newly created VisualStyle.
+        * 
+        * @return new VisualStyle
         */
        public VisualStyle getCreatedVisualStyle() {
                return created;

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedListener.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedListener.java
       2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleCreatedListener.java
       2010-10-26 20:24:47 UTC (rev 22472)
@@ -31,19 +31,22 @@
  You should have received a copy of the GNU Lesser General Public License
  along with this library; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
 package org.cytoscape.view.vizmap.events;
 
 import org.cytoscape.event.CyListener;
 
-
 /**
- * Listener for VisualStyleCreatedEvent.
+ * Listener for {...@linkplain VisualStyleCreatedEvent}.
  */
 public interface VisualStyleCreatedListener extends CyListener {
+
        /**
-        * DOCUMENT ME!
-        * @param e DOCUMENT ME!
+        * Do something with a new {...@linkplain VisualStyle}. Usually, GUI 
components
+        * and managers executes this method to update their states.
+        * 
+        * @param e
+        *            event contains new {...@linkplain VisualStyle} object.
         */
-       void handleEvent(VisualStyleCreatedEvent e);
+       void handleEvent(final VisualStyleCreatedEvent e);
 }

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
        2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedEvent.java
        2010-10-26 20:24:47 UTC (rev 22472)
@@ -38,17 +38,32 @@
 import org.cytoscape.view.vizmap.VisualStyle;
 
 /**
- * DOCUMENT ME!
+ * This event will be fired when {...@linkplain VisualStyle} object is deleted 
from
+ * {...@linkplain VisualMappingManager}.
  */
 public final class VisualStyleDestroyedEvent extends AbstractCyEvent<Object> {
 
        private final VisualStyle destroyed;
 
-       public VisualStyleDestroyedEvent(final Object source, final VisualStyle 
destroyed) {
+       /**
+        * create an event for the deleted VisualStyle.
+        * 
+        * @param source Usually this is the {...@linkplain 
VisualMappingManager}.
+        * @param destroyed VisualStyle to be deleted.
+        */
+       public VisualStyleDestroyedEvent(final Object source,
+                       final VisualStyle destroyed) {
                super(source, VisualStyleDestroyedListener.class);
                this.destroyed = destroyed;
        }
 
+       
+       /**
+        * Returns deleted VisualStyle.
+        * 
+        * @return VisualStyle just deleted.
+        * 
+        */
        public VisualStyle getDestroyedVisualStyle() {
                return destroyed;
        }

Modified: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedListener.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedListener.java
     2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleDestroyedListener.java
     2010-10-26 20:24:47 UTC (rev 22472)
@@ -31,19 +31,21 @@
  You should have received a copy of the GNU Lesser General Public License
  along with this library; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
 package org.cytoscape.view.vizmap.events;
 
 import org.cytoscape.event.CyListener;
 
-
 /**
- * Listener for VisualStyleDestroyedEvent.
+ * Listener for {...@linkplain VisualStyleDestroyedEvent}.
  */
 public interface VisualStyleDestroyedListener extends CyListener {
+
        /**
-        * DOCUMENT ME!
-        * @param e DOCUMENT ME!
+        * Update states/GUI using deleted {...@linkplain VisualStyle} 
information.
+        * 
+        * @param e
+        *            Event containing deleted VisualStyle.
         */
        void handleEvent(VisualStyleDestroyedEvent e);
 }

Deleted: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedEvent.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedEvent.java
 2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedEvent.java
 2010-10-26 20:24:47 UTC (rev 22472)
@@ -1,60 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications.  In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage.  See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-package org.cytoscape.view.vizmap.events;
-
-import org.cytoscape.event.AbstractCyEvent;
-
-import org.cytoscape.view.model.CyNetworkView;
-
-import org.cytoscape.view.vizmap.VisualStyle;
-
-
-/**
- * DOCUMENT ME!
-  */
-public final class VisualStyleSwitchedEvent extends 
AbstractCyEvent<CyNetworkView> {
-       private final VisualStyle newVS;
-       public VisualStyleSwitchedEvent(final CyNetworkView source, final 
VisualStyle newVS) {
-               super(source, VisualStyleSwitchedListener.class);
-               this.newVS = newVS;
-       }
-       /**
-        * DOCUMENT ME!
-        * @return the new VisualStyle
-        */
-       public VisualStyle getNewVisualStyle() { 
-               return newVS;
-       }
-}

Deleted: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedListener.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedListener.java
      2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/VisualStyleSwitchedListener.java
      2010-10-26 20:24:47 UTC (rev 22472)
@@ -1,49 +0,0 @@
-/*
- Copyright (c) 2008, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications.  In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage.  See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-package org.cytoscape.view.vizmap.events;
-
-import org.cytoscape.event.CyListener;
-
-
-/**
- * Listener for VisualStyleSwitchedEvent.
- */
-public interface VisualStyleSwitchedListener extends CyListener {
-       /**
-        * DOCUMENT ME!
-        * @param e DOCUMENT ME!
-        */
-       void handleEvent(VisualStyleSwitchedEvent e);
-}

Added: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/package-info.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/package-info.java
                             (rev 0)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/events/package-info.java
     2010-10-26 20:24:47 UTC (rev 22472)
@@ -0,0 +1,6 @@
+/**
+ * Events for Visual Mappings.
+ * 
+ */
+package org.cytoscape.view.vizmap.events;
+

Added: 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/package-info.java
===================================================================
--- 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/package-info.java
                            (rev 0)
+++ 
core3/vizmap-api/trunk/src/main/java/org/cytoscape/view/vizmap/package-info.java
    2010-10-26 20:24:47 UTC (rev 22472)
@@ -0,0 +1,6 @@
+/**
+ * Visual Mapping basic API module.
+ * 
+ */
+package org.cytoscape.view.vizmap;
+

Added: 
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
===================================================================
--- 
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
                                (rev 0)
+++ 
core3/vizmap-api/trunk/src/test/java/org/cytoscape/view/vizmap/VizmapEventsTest.java
        2010-10-26 20:24:47 UTC (rev 22472)
@@ -0,0 +1,50 @@
+package org.cytoscape.view.vizmap;
+
+
+import org.cytoscape.view.vizmap.events.VisualStyleChangedEvent;
+import org.cytoscape.view.vizmap.events.VisualStyleCreatedEvent;
+import org.cytoscape.view.vizmap.events.VisualStyleDestroyedEvent;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+public class VizmapEventsTest {
+
+       private VisualStyle style;
+       private VisualStyleFactory factory;
+       
+       @Before
+       public void setUp() throws Exception {
+               style = createMock(VisualStyle.class);
+               factory = createMock(VisualStyleFactory.class);
+       }
+
+       @After
+       public void tearDown() throws Exception {
+       }
+       
+       @Test
+       public void testVisualStyleCreatedEvent() {
+               final VisualStyleCreatedEvent event = new 
VisualStyleCreatedEvent(factory, style);
+               assertNotNull(event);
+               assertEquals(style, event.getCreatedVisualStyle());
+       }
+       
+       @Test
+       public void testVisualStyleDestroyedEvent() {
+               final VisualStyleDestroyedEvent event = new 
VisualStyleDestroyedEvent(factory, style);
+               assertNotNull(event);
+               assertEquals(style, event.getDestroyedVisualStyle());
+       }
+       
+       @Test
+       public void testVisualStyleChangedEvent() {
+               final VisualStyleChangedEvent event = new 
VisualStyleChangedEvent(style);
+               assertNotNull(event);
+               assertEquals(style, event.getSource());
+       }
+
+}

Modified: 
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
--- 
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
        2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
        2010-10-26 20:24:47 UTC (rev 22472)
@@ -236,7 +236,6 @@
                vsComboBoxModel = new DefaultComboBoxModel();
                final VisualStyle defaultVS = manager.getDefaultStyle();
                vsComboBoxModel.addElement(defaultVS);
-               vmm.addVisualStyle(defaultVS);
                visualStyleComboBox = new JComboBox(vsComboBoxModel);
 
                optionButton = new DropDownMenuButton(new AbstractAction() {

Modified: 
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
===================================================================
--- 
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
      2010-10-26 20:21:37 UTC (rev 22471)
+++ 
core3/vizmap-impl/trunk/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
      2010-10-26 20:24:47 UTC (rev 22472)
@@ -43,20 +43,21 @@
 import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.view.vizmap.VisualMappingManager;
 import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.view.vizmap.events.VisualStyleCreatedEvent;
+import org.cytoscape.view.vizmap.events.VisualStyleCreatedListener;
 import org.cytoscape.view.vizmap.events.VisualStyleDestroyedEvent;
+import org.cytoscape.view.vizmap.events.VisualStyleDestroyedListener;
 
-
 /**
  *
  */
-public class VisualMappingManagerImpl implements VisualMappingManager {
-       
+public class VisualMappingManagerImpl implements VisualMappingManager, 
VisualStyleCreatedListener, VisualStyleDestroyedListener {
+
        private final Map<CyNetworkView, VisualStyle> network2VisualStyleMap;
        private final Set<VisualStyle> visualStyles;
-       
+
        private final CyEventHelper cyEventHelper;
-       
-       
+
        public VisualMappingManagerImpl(final CyEventHelper eventHelper) {
                if (eventHelper == null)
                        throw new IllegalArgumentException("CyEventHelper 
cannot be null");
@@ -69,52 +70,72 @@
 
        /**
         * DOCUMENT ME!
-        *
+        * 
         * @param nv
         *            DOCUMENT ME!
-        *
+        * 
         * @return DOCUMENT ME!
         */
-       @Override public VisualStyle getVisualStyle(CyNetworkView nv) {
+       @Override
+       public VisualStyle getVisualStyle(CyNetworkView nv) {
                return network2VisualStyleMap.get(nv);
        }
 
        /**
         * DOCUMENT ME!
-        *
+        * 
         * @param vs
         *            DOCUMENT ME!
         * @param nv
         *            DOCUMENT ME!
         */
-       @Override public void setVisualStyle(VisualStyle vs, CyNetworkView nv) {
+       @Override
+       public void setVisualStyle(VisualStyle vs, CyNetworkView nv) {
                network2VisualStyleMap.put(nv, vs);
        }
 
-
        /**
-        * Remove the style from this manager and delete it.
-        *
+        * Remove a {...@linkplain VisualStyle} from this manager. This will be 
called
+        * through OSGi service mechanism.
+        * 
         * @param vs
         *            DOCUMENT ME!
         */
-       @Override public void removeVisualStyle(VisualStyle vs) {
+       private void removeVisualStyle(VisualStyle vs) {
                visualStyles.remove(vs);
-               cyEventHelper.fireSynchronousEvent(new 
VisualStyleDestroyedEvent(this,vs));
+               cyEventHelper.fireSynchronousEvent(new 
VisualStyleDestroyedEvent(this,
+                               vs));
                vs = null;
        }
-       
 
        /**
-        *  DOCUMENT ME!
-        *
-        * @return  DOCUMENT ME!
+        * Add a new VisualStyle ot this manager. This will be called through 
OSGi
+        * service mechanism.
+        * 
+        * @param vs
         */
-       @Override public Set<VisualStyle> getAllVisualStyles() {
+       private void addVisualStyle(final VisualStyle vs) {
+               this.visualStyles.add(vs);
+       }
+
+       /**
+        * DOCUMENT ME!
+        * 
+        * @return DOCUMENT ME!
+        */
+       @Override
+       public Set<VisualStyle> getAllVisualStyles() {
                return visualStyles;
        }
 
-       @Override public void addVisualStyle(VisualStyle vs) {
-               this.visualStyles.add(vs);
+       @Override
+       public void handleEvent(VisualStyleDestroyedEvent e) {
+               removeVisualStyle(e.getDestroyedVisualStyle());
        }
+
+       @Override
+       public void handleEvent(VisualStyleCreatedEvent e) {
+               addVisualStyle(e.getCreatedVisualStyle());
+       }
+
 }

Modified: 
cytoscape3/trunk/application/src/main/java/cytoscape/internal/dialogs/PreferencesDialogImpl.java
===================================================================
--- 
cytoscape3/trunk/application/src/main/java/cytoscape/internal/dialogs/PreferencesDialogImpl.java
    2010-10-26 20:21:37 UTC (rev 22471)
+++ 
cytoscape3/trunk/application/src/main/java/cytoscape/internal/dialogs/PreferencesDialogImpl.java
    2010-10-26 20:24:47 UTC (rev 22472)
@@ -36,35 +36,41 @@
 */
 package cytoscape.internal.dialogs;
 
-import org.cytoscape.event.CyEventHelper;
-
-import org.cytoscape.view.vizmap.events.SaveVizmapPropsEvent;
-import org.cytoscape.view.vizmap.events.SaveVizmapPropsListener;
-
-import cytoscape.events.PreferencesUpdatedEvent;
-import cytoscape.events.PreferencesUpdatedListener;
-
-import cytoscape.Cytoscape;
-import cytoscape.CyOperatingContext;
-
-import javax.swing.*;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableModel;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Properties;
 
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextArea;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableModel;
 
+import org.cytoscape.event.CyEventHelper;
+
+import cytoscape.CyOperatingContext;
+import cytoscape.events.PreferencesUpdatedEvent;
+
+
 /**
  *
  */

-- 
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.

Reply via email to