Author: jm
Date: 2012-08-15 08:02:11 -0700 (Wed, 15 Aug 2012)
New Revision: 30196
Modified:
core3/api/trunk/property-api/pom.xml
core3/api/trunk/property-api/src/main/java/org/cytoscape/property/bookmark/BookmarksUtil.java
core3/impl/trunk/property-impl/src/main/java/org/cytoscape/property/internal/bookmark/BookmarksUtilImpl.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/dialogs/BookmarkDialogImpl.java
Log:
Reverted r30192, r30193, r30194 because of circular dependency
Modified: core3/api/trunk/property-api/pom.xml
===================================================================
--- core3/api/trunk/property-api/pom.xml 2012-08-15 14:17:43 UTC (rev
30195)
+++ core3/api/trunk/property-api/pom.xml 2012-08-15 15:02:11 UTC (rev
30196)
@@ -97,12 +97,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>datasource-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
core3/api/trunk/property-api/src/main/java/org/cytoscape/property/bookmark/BookmarksUtil.java
===================================================================
---
core3/api/trunk/property-api/src/main/java/org/cytoscape/property/bookmark/BookmarksUtil.java
2012-08-15 14:17:43 UTC (rev 30195)
+++
core3/api/trunk/property-api/src/main/java/org/cytoscape/property/bookmark/BookmarksUtil.java
2012-08-15 15:02:11 UTC (rev 30196)
@@ -1,8 +1,6 @@
package org.cytoscape.property.bookmark;
import java.util.List;
-import java.util.Map;
-
/**
* A set of utility methods to manipulate the bookmarks.
* @CyAPI.Api.Interface
@@ -84,12 +82,4 @@
*/
boolean containsBookmarks(Bookmarks pBookmarks, String pCategoryName,
DataSource pDataSource);
- /**
- * Retrive the org.cytoscape.io.datasource.DataSource for the given
org.cytoscape.property.internal.bookmark.DataSource.
- *
- * @param pDataSource DataSource
- *
- * @return org.cytoscape.io.datasource.DataSource if the DataSource
exist, null otherwise
- */
- org.cytoscape.io.datasource.DataSource getCyDataSource(DataSource
pDataSource);
}
Modified:
core3/impl/trunk/property-impl/src/main/java/org/cytoscape/property/internal/bookmark/BookmarksUtilImpl.java
===================================================================
---
core3/impl/trunk/property-impl/src/main/java/org/cytoscape/property/internal/bookmark/BookmarksUtilImpl.java
2012-08-15 14:17:43 UTC (rev 30195)
+++
core3/impl/trunk/property-impl/src/main/java/org/cytoscape/property/internal/bookmark/BookmarksUtilImpl.java
2012-08-15 15:02:11 UTC (rev 30196)
@@ -332,8 +332,4 @@
return false;
}
-
- public org.cytoscape.io.datasource.DataSource
getCyDataSource(DataSource pDataSource){
- return this.dataSourceMap.get(pDataSource);
- }
}
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/dialogs/BookmarkDialogImpl.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/dialogs/BookmarkDialogImpl.java
2012-08-15 14:17:43 UTC (rev 30195)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/dialogs/BookmarkDialogImpl.java
2012-08-15 15:02:11 UTC (rev 30196)
@@ -230,8 +230,8 @@
this.dispose();
} else if (_btn == btnAddBookmark) {
EditBookmarkDialog theNewDialog = new
EditBookmarkDialog(this,
- true, bookmarks,
bookmarkCategory, "new", null, bkUtil);
- theNewDialog.setSize(400, 300);
+ true, bookmarks,
bookmarkCategory, "new", null);
+ theNewDialog.setSize(300, 250);
theNewDialog.setLocationRelativeTo(this);
theNewDialog.setVisible(true);
@@ -241,8 +241,8 @@
.getSelectedValue();
EditBookmarkDialog theEditDialog = new
EditBookmarkDialog(this,
true, bookmarks,
bookmarkCategory, "edit",
- theDataSource, bkUtil);
- theEditDialog.setSize(400, 300);
+ theDataSource);
+ theEditDialog.setSize(300, 250);
theEditDialog.setLocationRelativeTo(this);
theEditDialog.setVisible(true);
@@ -340,26 +340,23 @@
private final static long serialVersionUID = 1202339873325728L;
private String name;
private String URLstr;
- private String provider = "";
private JDialog parent;
private Bookmarks theBookmarks;
private String categoryName;
private String mode = "new"; // new/edit
private DataSource dataSource = null;
- private BookmarksUtil bkUtil;
/** Creates new form NewBookmarkDialog */
public EditBookmarkDialog(JDialog parent, boolean modal,
Bookmarks pBookmarks, String categoryName,
String pMode,
- DataSource pDataSource, BookmarksUtil bkUtil) {
+ DataSource pDataSource) {
super(parent, modal);
this.parent = parent;
this.theBookmarks = pBookmarks;
this.categoryName = categoryName;
this.mode = pMode;
this.dataSource = pDataSource;
- this.bkUtil = bkUtil;
-
+
initComponents();
lbCategoryValue.setText(categoryName);
@@ -373,12 +370,6 @@
tfName.setText(dataSource.getName());
tfName.setEditable(false);
tfURL.setText(dataSource.getHref());
- if (bkUtil.getCyDataSource(dataSource) != null){
-
tfProvider.setText(bkUtil.getCyDataSource(dataSource).getProvider());
- }
- else {
- tfProvider.setText("");
- }
}
}
@@ -392,7 +383,6 @@
if ((_btn == btnOK) &&
(mode.equalsIgnoreCase("new"))) {
name = tfName.getText();
URLstr = tfURL.getText();
- provider = tfProvider.getText().trim();
if (name.trim().equals("") ||
URLstr.trim().equals("")) {
String msg = "Please provide a
name/URL.";
@@ -418,14 +408,13 @@
}
bkUtil.saveBookmark(theBookmarks,
categoryName,
- theDataSource,
provider);
+ theDataSource);
this.dispose();
}
if ((_btn == btnOK) &&
(mode.equalsIgnoreCase("edit"))) {
name = tfName.getText();
URLstr = tfURL.getText();
- provider = tfProvider.getText().trim();
if (URLstr.trim().equals("")) {
String msg = "URL is empty.";
@@ -445,7 +434,7 @@
bkUtil.deleteBookmark(theBookmarks,
bookmarkCategory,
theDataSource);
bkUtil.saveBookmark(theBookmarks,
categoryName,
- theDataSource,
this.provider);
+ theDataSource);
this.dispose();
} else if (_btn == btnCancel) {
this.dispose();
@@ -458,144 +447,104 @@
* form. WARNING: Do NOT modify this code. The content of this
method is
* always regenerated by the Form Editor.
*/
- // <editor-fold defaultstate="collapsed" desc="Generated Code">
- private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
- lbCategory = new javax.swing.JLabel();
- lbCategoryValue = new javax.swing.JLabel();
- jLabel3 = new javax.swing.JLabel();
- tfProvider = new javax.swing.JTextField();
- lbName = new javax.swing.JLabel();
- tfName = new javax.swing.JTextField();
- lbURL = new javax.swing.JLabel();
- tfURL = new javax.swing.JTextField();
- jPanel1 = new javax.swing.JPanel();
- btnOK = new javax.swing.JButton();
- btnCancel = new javax.swing.JButton();
+ // <editor-fold defaultstate="collapsed" desc=" Generated Code
">
+ private void initComponents() {
+ java.awt.GridBagConstraints gridBagConstraints;
-
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
- setTitle("Add new Bookmark");
- getContentPane().setLayout(new java.awt.GridBagLayout());
+ lbName = new javax.swing.JLabel();
+ tfName = new javax.swing.JTextField();
+ lbURL = new javax.swing.JLabel();
+ tfURL = new javax.swing.JTextField();
+ jPanel1 = new javax.swing.JPanel();
+ btnOK = new javax.swing.JButton();
+ btnCancel = new javax.swing.JButton();
+ lbCategory = new javax.swing.JLabel();
+ lbCategoryValue = new javax.swing.JLabel();
- lbCategory.setText("Category");
- lbCategory.setName("lbCategory"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(30, 10, 0, 0);
- getContentPane().add(lbCategory, gridBagConstraints);
+ getContentPane().setLayout(new
java.awt.GridBagLayout());
- lbCategoryValue.setText("network");
- lbCategoryValue.setName("lbCategoryValue"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.anchor =
java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(30, 10, 0, 0);
- getContentPane().add(lbCategoryValue, gridBagConstraints);
+
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+ lbName.setText("Name:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.anchor =
java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.insets = new java.awt.Insets(10, 10,
10, 10);
+ getContentPane().add(lbName, gridBagConstraints);
- jLabel3.setText("Provider:");
- jLabel3.setName("jLabel3"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(20, 10, 0, 20);
- getContentPane().add(jLabel3, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.fill =
java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(10, 10,
10, 10);
+ getContentPane().add(tfName, gridBagConstraints);
- tfProvider.setName("tfProvider"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.fill =
java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor =
java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(20, 10, 0, 15);
- getContentPane().add(tfProvider, gridBagConstraints);
+ lbURL.setText("URL:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 2;
+ gridBagConstraints.anchor =
java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.insets = new java.awt.Insets(10, 10,
10, 10);
+ getContentPane().add(lbURL, gridBagConstraints);
- lbName.setText("Name:");
- lbName.setName("lbName"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.anchor =
java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(20, 10, 0, 20);
- getContentPane().add(lbName, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.fill =
java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.insets = new java.awt.Insets(10, 10,
10, 10);
+ getContentPane().add(tfURL, gridBagConstraints);
- tfName.setName("tfName"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.gridwidth = 2;
- gridBagConstraints.gridheight = 2;
- gridBagConstraints.fill =
java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor =
java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(20, 10, 0, 15);
- getContentPane().add(tfName, gridBagConstraints);
+ btnOK.setText("OK");
+ btnOK.setPreferredSize(new java.awt.Dimension(65, 23));
+ jPanel1.add(btnOK);
- lbURL.setText("URL:");
- lbURL.setName("lbURL"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
- gridBagConstraints.anchor =
java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(20, 10, 0, 20);
- getContentPane().add(lbURL, gridBagConstraints);
+ btnCancel.setText("Cancel");
+ jPanel1.add(btnCancel);
- tfURL.setName("tfURL"); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 3;
- gridBagConstraints.fill =
java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(20, 10, 0, 15);
- getContentPane().add(tfURL, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridwidth = 2;
+ gridBagConstraints.insets = new java.awt.Insets(20, 20,
20, 20);
+ getContentPane().add(jPanel1, gridBagConstraints);
- jPanel1.setName("jPanel1"); // NOI18N
+ lbCategory.setText("Category:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.anchor =
java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.insets = new java.awt.Insets(20, 10,
10, 0);
+ getContentPane().add(lbCategory, gridBagConstraints);
- btnOK.setText("OK");
- btnOK.setName("btnOK"); // NOI18N
- jPanel1.add(btnOK);
+ lbCategoryValue.setText("network");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.anchor =
java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.insets = new java.awt.Insets(20, 10,
10, 0);
+ getContentPane().add(lbCategoryValue,
gridBagConstraints);
- btnCancel.setText("Cancel");
- btnCancel.setName("btnCancel"); // NOI18N
- jPanel1.add(btnCancel);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 4;
- gridBagConstraints.gridwidth = 2;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.weighty = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(30, 0, 0, 0);
- getContentPane().add(jPanel1, gridBagConstraints);
-
btnOK.addActionListener(this);
btnCancel.addActionListener(this);
-
- pack();
- }// </editor-fold>
-
- // Variables declaration - do not modify
- private javax.swing.JButton btnCancel;
- private javax.swing.JButton btnOK;
- private javax.swing.JLabel jLabel3;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JLabel lbCategory;
- private javax.swing.JLabel lbCategoryValue;
- private javax.swing.JLabel lbName;
- private javax.swing.JLabel lbURL;
- private javax.swing.JTextField tfName;
- private javax.swing.JTextField tfProvider;
- private javax.swing.JTextField tfURL;
- // End of variables declaration
+
+ pack();
+ } // </editor-fold>
+
+ // Variables declaration - do not modify
+ private javax.swing.JButton btnCancel;
+ private javax.swing.JButton btnOK;
+ private javax.swing.JPanel jPanel1;
+ private javax.swing.JLabel lbCategory;
+ private javax.swing.JLabel lbCategoryValue;
+ private javax.swing.JLabel lbName;
+ private javax.swing.JLabel lbURL;
+ private javax.swing.JTextField tfName;
+ private javax.swing.JTextField tfURL;
+
+ // End of variables declaration
}
public void showDialog() {
setVisible(true);
+
}
}
--
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.
