Author: mes
Date: 2011-11-28 12:34:33 -0800 (Mon, 28 Nov 2011)
New Revision: 27608
Added:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCyEdit.java
Removed:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/CyAbstractEdit.java
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/LayoutEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectionEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/FitContentEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/ZoomEdit.java
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
Log:
Renamed class to fit existing naming convention.
Copied:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCyEdit.java
(from rev 27606,
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/CyAbstractEdit.java)
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCyEdit.java
(rev 0)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCyEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -0,0 +1,74 @@
+/*
+ File: CyAbstractEdit.java
+
+ Copyright (c) 2006, 2011, The Cytoscape Consortium (www.cytoscape.org)
+
+ 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.util.swing;
+
+
+import javax.swing.undo.AbstractUndoableEdit;
+
+
+/**
+ * A small convenience class that can be used to create new edits. All
+ * you should have to do is implement the undo() and redo() methods. The
+ * benefit is that you don't need to worry about setting up names.
+ * @CyAPI.Abstract.Class
+ */
+public abstract class AbstractCyEdit extends AbstractUndoableEdit {
+ /** The presentation name of this CyAbstractEdit. */
+ protected String desc;
+
+ /**
+ * Constructor.
+ * @param desc The presentation name of this CyAbstractEdit.
+ */
+ public AbstractCyEdit(String desc) {
+ super();
+ this.desc = desc;
+ }
+
+ public String getPresentationName() {
+ return desc;
+ }
+
+ public String getRedoPresentationName() {
+ return "Redo: " + desc;
+ }
+
+ public String getUndoPresentationName() {
+ return "Undo: " + desc;
+ }
+
+ public void undo() {
+ super.undo();
+ }
+
+ public void redo() {
+ super.redo();
+ }
+}
Deleted:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/CyAbstractEdit.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/CyAbstractEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/CyAbstractEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -1,74 +0,0 @@
-/*
- File: CyAbstractEdit.java
-
- Copyright (c) 2006, 2011, The Cytoscape Consortium (www.cytoscape.org)
-
- 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.util.swing;
-
-
-import javax.swing.undo.AbstractUndoableEdit;
-
-
-/**
- * A small convenience class that can be used to create new edits. All
- * you should have to do is implement the undo() and redo() methods. The
- * benefit is that you don't need to worry about setting up names.
- * @CyAPI.Abstract.Class
- */
-public abstract class CyAbstractEdit extends AbstractUndoableEdit {
- /** The presentation name of this CyAbstractEdit. */
- protected String desc;
-
- /**
- * Constructor.
- * @param desc The presentation name of this CyAbstractEdit.
- */
- public CyAbstractEdit(String desc) {
- super();
- this.desc = desc;
- }
-
- public String getPresentationName() {
- return desc;
- }
-
- public String getRedoPresentationName() {
- return "Redo: " + desc;
- }
-
- public String getUndoPresentationName() {
- return "Undo: " + desc;
- }
-
- public void undo() {
- super.undo();
- }
-
- public void redo() {
- super.redo();
- }
-}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -20,11 +20,11 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.View;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo the creation of a network view.
*/
-final class CreateNetworkViewEdit extends CyAbstractEdit {
+final class CreateNetworkViewEdit extends AbstractCyEdit {
private final CyEventHelper eventHelper;
private final CyNetwork network;
private final CyNetworkViewFactory viewFactory;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -5,7 +5,7 @@
import java.util.Collection;
import java.util.List;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyEdge.Type;
import org.cytoscape.model.CyNetwork;
@@ -14,7 +14,7 @@
/** An undoable edit that will undo and redo the connecting of selected nodes.
*/
-final class ConnectSelectedNodesEdit extends CyAbstractEdit {
+final class ConnectSelectedNodesEdit extends AbstractCyEdit {
private final CyNetwork network;
private Collection<CyEdge> edges;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -14,11 +14,11 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo hiding of nodes and edges. */
-final class HideEdit extends CyAbstractEdit {
+final class HideEdit extends AbstractCyEdit {
private final CyEventHelper eventHelper;
private final CyNetwork network;
private final CyNetworkView view;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/LayoutEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/LayoutEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/layout/LayoutEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -14,13 +14,13 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNode;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
/** An undoable edit that will undo and redo the zooming of a network view. */
-final class LayoutEdit extends CyAbstractEdit {
+final class LayoutEdit extends AbstractCyEdit {
private final CyEventHelper eventHelper;
private final CyNetworkView view;
private List<NodeViewAndLocations> nodeViewsAndLocations;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/networkobjects/DeleteEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -16,13 +16,13 @@
import org.cytoscape.view.model.View;
import org.cytoscape.view.vizmap.VisualMappingManager;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/**
* An undoable edit that will undo and redo deletion of nodes and edges.
*/
-final class DeleteEdit extends CyAbstractEdit {
+final class DeleteEdit extends AbstractCyEdit {
private final List<CyNode> nodes;
private final Set<CyEdge> edges;
private final double[] xPos;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectionEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectionEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectionEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -9,11 +9,11 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyRow;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo selection of nodes and edges. */
-final class SelectionEdit extends CyAbstractEdit {
+final class SelectionEdit extends AbstractCyEdit {
public static enum SelectionFilter {
NODES_ONLY, EDGES_ONLY, NODES_AND_EDGES;
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/CopyValueToEntireColumnEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -6,11 +6,11 @@
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo the copying of a value to an
entire column. */
-final class CopyValueToEntireColumnEdit extends CyAbstractEdit {
+final class CopyValueToEntireColumnEdit extends AbstractCyEdit {
private final CyTable table;
private final String columnName;
private final Class<?> columnType;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -3,11 +3,11 @@
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyTable;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo the deletion of a column. */
-final class DeleteColumnEdit extends CyAbstractEdit {
+final class DeleteColumnEdit extends AbstractCyEdit {
private final CyTable table;
private final String columnName;
private final Class<?> columnType;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteTableEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -4,11 +4,11 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo the deletion of a table. */
-final class DeleteTableEdit extends CyAbstractEdit {
+final class DeleteTableEdit extends AbstractCyEdit {
private CyTable table;
private final CyTableManager tableManager;
private final CyTableFactory tableFactory;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -2,11 +2,11 @@
import org.cytoscape.model.CyColumn;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo the renaming of a column. */
-final class RenameColumnEdit extends CyAbstractEdit {
+final class RenameColumnEdit extends AbstractCyEdit {
private final CyColumn column;
private String oldName;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -3,11 +3,11 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableEntry;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
/** An undoable edit that will undo and redo renaming of a network. */
-final class NetworkTitleEdit extends CyAbstractEdit {
+final class NetworkTitleEdit extends AbstractCyEdit {
private final CyNetwork network;
private String previousTitle;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/FitContentEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/FitContentEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/FitContentEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -5,13 +5,13 @@
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NETWORK_CENTER_Y_LOCATION;
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NETWORK_SCALE_FACTOR;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualProperty;
/** An undoable edit that will undo and redo the fitting of the content of a
network view. */
-final class FitContentEdit extends CyAbstractEdit {
+final class FitContentEdit extends AbstractCyEdit {
private final CyNetworkView view;
private final double networkScaleFactor;
private final double networkCenterXLocation;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/ZoomEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/ZoomEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/zoom/ZoomEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -3,12 +3,12 @@
import static
org.cytoscape.view.presentation.property.MinimalVisualLexicon.NETWORK_SCALE_FACTOR;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
import org.cytoscape.view.model.CyNetworkView;
/** An undoable edit that will undo and redo the zooming of a network view. */
-final class ZoomEdit extends CyAbstractEdit {
+final class ZoomEdit extends AbstractCyEdit {
private final CyNetworkView view;
private final double factor;
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
2011-11-28 20:18:36 UTC (rev 27607)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/cytoscape/MergeNetworkEdit.java
2011-11-28 20:34:33 UTC (rev 27608)
@@ -43,7 +43,7 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.util.swing.CyAbstractEdit;
+import org.cytoscape.util.swing.AbstractCyEdit;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
@@ -52,7 +52,7 @@
* An undoable edit used by MergeNetworkTask
* to provide undo/redo support. Code based on cytoscape.editor.AddNodeEdit
*/
-public class MergeNetworkEdit extends CyAbstractEdit {
+public class MergeNetworkEdit extends AbstractCyEdit {
/**
* ref to CyNetwork that we are modifying
--
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.
