Author: pwang
Date: 2012-08-13 16:23:23 -0700 (Mon, 13 Aug 2012)
New Revision: 30182
Modified:
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
Log:
Fixed bug#1270
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-13 22:18:14 UTC (rev 30181)
+++
core3/api/trunk/property-api/src/main/java/org/cytoscape/property/bookmark/BookmarksUtil.java
2012-08-13 23:23:23 UTC (rev 30182)
@@ -46,7 +46,19 @@
void saveBookmark(Bookmarks pBookmarks, String pCategoryName,
DataSource pDataSource);
+
/**
+ * Store a bookmark object in bookmarks object
+ *
+ * @param pBookmarks bookmarks object
+ * @param pCategoryName category name
+ * @param pDataSource a single bookmark
+ * @param pProvider the name of provider
+ */
+ void saveBookmark(Bookmarks pBookmarks, String pCategoryName,
+ DataSource pDataSource, String pProvider);
+
+ /**
* Delete a bookmark (pDataSource) from the category (pCategoryName) in
the bookmarks object (pBookmarks)
*
* @param pBookmarks Bookmark object, which hold a set of bookmark
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-13 22:18:14 UTC (rev 30181)
+++
core3/impl/trunk/property-impl/src/main/java/org/cytoscape/property/internal/bookmark/BookmarksUtilImpl.java
2012-08-13 23:23:23 UTC (rev 30182)
@@ -178,7 +178,13 @@
* org.cytoscape.properties.bookmark.DataSource)
*/
public void saveBookmark(Bookmarks pBookmarks, String pCategoryName,
- DataSource pDataSource) {
+ DataSource pDataSource) {
+ saveBookmark(pBookmarks, pCategoryName, pDataSource, "Example");
+ }
+
+
+ public void saveBookmark(Bookmarks pBookmarks, String pCategoryName,
+ DataSource pDataSource, String pProvider){
if (pBookmarks == null) {
pBookmarks = new Bookmarks();
}
@@ -206,7 +212,7 @@
if(!theObjList.contains(pDataSource))
theObjList.add(pDataSource);
- org.cytoscape.io.datasource.DataSource data =
convertToDataSource(pBookmarks,pCategoryName,pDataSource);
+ org.cytoscape.io.datasource.DataSource data =
convertToDataSource(pBookmarks,pCategoryName,pDataSource, pProvider);
if(data != null && !dataSourceMap.containsKey(pDataSource))
{
@@ -217,13 +223,20 @@
}
+
public org.cytoscape.io.datasource.DataSource
convertToDataSource(Bookmarks pBookmarks,
- String pCategoryName,DataSource pDataSource){
+ String pCategoryName,DataSource pDataSource){
+ return convertToDataSource(pBookmarks,pCategoryName,
pDataSource, "Example");
+ }
+
+
+ public org.cytoscape.io.datasource.DataSource
convertToDataSource(Bookmarks pBookmarks,
+ String pCategoryName, DataSource pDataSource, String
pProvider){
final String location = pDataSource.getHref();
final String name = pDataSource.getName();
final String description = "From Bookmarks";
- final String provider = "Example";
+ //final String provider = "Example";
DataCategory dataType;
URL url = null;
@@ -243,7 +256,7 @@
return null;
}
- return (new DefaultDataSource(name, provider,description,
dataType, url));
+ return (new DefaultDataSource(name, pProvider, description,
dataType, url));
}
/*
--
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.
