Menu
▾
▴
[Giews-commit] SF.net SVN: giews: [4607] trunk/fenix-web/src/main/java/org/fao/fenix/web/ client
|
From: <eri...@us...> - 2008-07-15 10:46:46
|
Revision: 4607
http://giews.svn.sourceforge.net/giews/?rev=4607&view=rev
Author: erikvaningen
Date: 2008-07-15 03:46:53 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
corrected adding dataset to project explorer
Modified Paths:
--------------
trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java
trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java
trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java
Modified: trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java
===================================================================
--- trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java 2008-07-15 10:01:52 UTC (rev 4606)
+++ trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java 2008-07-15 10:46:53 UTC (rev 4607)
@@ -80,7 +80,7 @@
// add tool-bar
window.getContent().add(new ProjectManagerToolbar().build());
-
+
// open window
window.setLocation(Window.getClientWidth() - 350, (int) (Window.getClientHeight() / 5));
window.open();
@@ -127,7 +127,8 @@
public void createUntitledTree() {
Tree tree = new Tree();
- FenixResource project = new FenixResource("untitled", Fenix.fenixLang.untitled(), Fenix.fenixLang.untitled(), "project", "");
+ FenixResource project = new FenixResource("untitled", Fenix.fenixLang.untitled(), Fenix.fenixLang.untitled(),
+ "project", "");
createProjectFolder(tree, project);
initiateTree(tree);
tree.expandAll();
@@ -169,8 +170,8 @@
if (Fenix.fenixLang == null)
Fenix.fenixLang = (FenixLang) GWT.create(FenixLang.class);
resourceTypeMap.put(Fenix.fenixLang.chart(), ResourceTypeNew.CHARTVIEW);
- resourceTypeMap.put(Fenix.fenixLang.datasets(), "dataset");
- resourceTypeMap.put(Fenix.fenixLang.layers(), "layer");
+ resourceTypeMap.put(Fenix.fenixLang.datasets(), ResourceTypeNew.DATASET);
+ resourceTypeMap.put(Fenix.fenixLang.layers(), ResourceTypeNew.LAYER);
resourceTypeMap.put(Fenix.fenixLang.map(), ResourceTypeNew.MAPVIEW);
resourceTypeMap.put(Fenix.fenixLang.reports(), ResourceTypeNew.REPORT);
resourceTypeMap.put(Fenix.fenixLang.table(), ResourceTypeNew.TABLEVIEW);
@@ -226,7 +227,7 @@
Fenix.newProjectManager.window.getContent().getLayout().layout(Fenix.newProjectManager.window.getContent());
}
}
-
+
public void removeResourceFromProject(FenixResource rsrc, String projectId) {
TreeItem item = Fenix.newProjectManager.selectedItem;
if (item != null) {
@@ -270,7 +271,7 @@
}
private void addTreeListener(final Tree tree) {
-
+
tree.addListener(Events.Click, new Listener() {
public void handleEvent(BaseEvent event) {
TreeItem item = (TreeItem) event.widget;
@@ -285,18 +286,18 @@
ProjectManagerOpener.open();
}
});
-
- //initialize the project manager context menu
- tree.setContextMenu(new ProjectManagerContextMenu().build(null));
-
- tree.addListener(Events.ContextMenu, new Listener() {
- public void handleEvent(BaseEvent event) {
- Tree t = (Tree) event.widget;
- TreeItem sel = t.getSelectedItem();
+
+ // initialize the project manager context menu
+ tree.setContextMenu(new ProjectManagerContextMenu().build(null));
+
+ tree.addListener(Events.ContextMenu, new Listener() {
+ public void handleEvent(BaseEvent event) {
+ Tree t = (Tree) event.widget;
+ TreeItem sel = t.getSelectedItem();
selectedItem = sel;
-
+
tree.setContextMenu(new ProjectManagerContextMenu().build(selectedItem));
-
+
}
});
}
@@ -312,7 +313,7 @@
map[2]++;
else if (((FenixResource) vector.get(i)).getType().equals(ResourceTypeNew.REPORT))
map[3]++;
- else if (((FenixResource) vector.get(i)).getType().equals("dataset"))
+ else if (((FenixResource) vector.get(i)).getType().equals(ResourceTypeNew.DATASET))
map[4]++;
else if (((FenixResource) vector.get(i)).getType().equals(ResourceTypeNew.TEXTVIEW))
map[5]++;
@@ -322,15 +323,13 @@
public void fillIconMap() {
iconMap.put(ResourceTypeNew.MAPVIEW, "pmMap");
- iconMap.put("MapView", "pmMap");
iconMap.put(ResourceTypeNew.CHARTVIEW, "pmChart");
iconMap.put(ResourceTypeNew.TABLEVIEW, "pmTable");
- iconMap.put("dataset", "pmDataset");
+ iconMap.put(ResourceTypeNew.DATASET, "pmDataset");
iconMap.put(ResourceTypeNew.REPORT, "pmReport");
iconMap.put(ResourceTypeNew.TEXTVIEW, "pmText");
- iconMap.put("layer", "pmLayer");
- iconMap.put("project", "tree-folder-open");
- iconMap.put("project", "tree-folder");
+ iconMap.put(ResourceTypeNew.LAYER, "pmLayer");
+ iconMap.put(ResourceTypeNew.PROJECT, "tree-folder-open");
}
public boolean untitledExists() {
@@ -343,6 +342,6 @@
return true;
}
return false;
- }
-
+ }
+
}
Modified: trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java
===================================================================
--- trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java 2008-07-15 10:01:52 UTC (rev 4606)
+++ trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java 2008-07-15 10:46:53 UTC (rev 4607)
@@ -43,6 +43,7 @@
import org.fao.fenix.web.client.re2.search.SearchMask;
import org.fao.fenix.web.client.re2.search.SearchPanelToolbar;
import org.fao.fenix.web.client.re2.search.SearchScope;
+import org.fao.fenix.web.client.util.FenixConstants;
import org.fao.fenix.web.client.util.ShellUtils;
import com.google.gwt.user.client.ui.Panel;
@@ -77,8 +78,8 @@
searchMask = new SearchMask();
catalogueList = new CatalogueList();
listPanel = new ContentPanel(Style.HEADER);
- caller = "";
- // resourceType = ResourceSearchType.PROJECT;
+ caller = FenixConstants.PROJECT_MANAGER;
+ resourceType = ResourceSearchType.PROJECT;
peer = "http://localhost:8080/fenix-services/services/CommunicationModuleService";
searchEvent = new SearchEvent();
fenixSearchParameters = new FenixSearchParameters();
Modified: trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java
===================================================================
--- trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java 2008-07-15 10:01:52 UTC (rev 4606)
+++ trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java 2008-07-15 10:46:53 UTC (rev 4607)
@@ -25,7 +25,6 @@
import org.fao.fenix.web.client.util.Loading;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.ListBox;
public class CatalogueContextMenu {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
