Menu
▾
▴
[Zerokode-svn-log] SF.net SVN: zerokode: [28] trunk
|
From: <wat...@us...> - 2007-12-19 07:10:36
|
Revision: 28
http://zerokode.svn.sourceforge.net/zerokode/?rev=28&view=rev
Author: waterbottle
Date: 2007-12-18 23:10:34 -0800 (Tue, 18 Dec 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/WebContent/WEB-INF/lib/fckez.jar
trunk/WebContent/WEB-INF/lib/gmapsz.jar
trunk/WebContent/WEB-INF/lib/timelinez.jar
trunk/WebContent/WEB-INF/lib/zcommon.jar
trunk/WebContent/WEB-INF/lib/zhtml.jar
trunk/WebContent/WEB-INF/lib/zk.jar
trunk/WebContent/WEB-INF/lib/zkex.jar
trunk/WebContent/WEB-INF/lib/zkmax.jar
trunk/WebContent/WEB-INF/lib/zkplus.jar
trunk/WebContent/WEB-INF/lib/zul.jar
trunk/WebContent/WEB-INF/lib/zweb.jar
trunk/src/org/zerokode/designer/events/listeners/ToolbarEventListener.java
trunk/src/org/zerokode/designer/model/CanvasTreeSynchronizer.java
trunk/src/org/zerokode/designer/model/ComponentFactory.java
trunk/src/org/zerokode/designer/model/ZUMLModel.java
trunk/src/org/zerokode/designer/ui/DesignerCanvas.java
trunk/src/org/zerokode/designer/ui/DesignerTree.java
trunk/src/org/zerokode/designer/ui/PropertiesWindow.java
Added Paths:
-----------
trunk/WebContent/WEB-INF/lib/zml.jar
Modified: trunk/WebContent/WEB-INF/lib/fckez.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/gmapsz.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/timelinez.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/zcommon.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/zhtml.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/zk.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/zkex.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/zkmax.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/zkplus.jar
===================================================================
(Binary files differ)
Added: trunk/WebContent/WEB-INF/lib/zml.jar
===================================================================
(Binary files differ)
Property changes on: trunk/WebContent/WEB-INF/lib/zml.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/WebContent/WEB-INF/lib/zul.jar
===================================================================
(Binary files differ)
Modified: trunk/WebContent/WEB-INF/lib/zweb.jar
===================================================================
(Binary files differ)
Modified: trunk/src/org/zerokode/designer/events/listeners/ToolbarEventListener.java
===================================================================
--- trunk/src/org/zerokode/designer/events/listeners/ToolbarEventListener.java 2007-11-20 02:16:00 UTC (rev 27)
+++ trunk/src/org/zerokode/designer/events/listeners/ToolbarEventListener.java 2007-12-19 07:10:34 UTC (rev 28)
@@ -10,12 +10,12 @@
import org.zerokode.designer.ui.InfoDialog;
import org.zerokode.designer.ui.SaveModelDialog;
import org.zkoss.util.media.Media;
-import org.zkoss.zhtml.Fileupload;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.WebApp;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zul.Fileupload;
@@ -95,7 +95,7 @@
return;
// display the Fileupload dialog
- Media media = Fileupload.get("Select a '*.zul' file from the explorer and it will be displayed on the canvas", "Load page definition");
+ Media media = Fileupload.get("Select a '*.zul' file from the explorer and it will be displayed on the canvas", "Load page definition",true);
if (media == null)
return;
Modified: trunk/src/org/zerokode/designer/model/CanvasTreeSynchronizer.java
===================================================================
--- trunk/src/org/zerokode/designer/model/CanvasTreeSynchronizer.java 2007-11-20 02:16:00 UTC (rev 27)
+++ trunk/src/org/zerokode/designer/model/CanvasTreeSynchronizer.java 2007-12-19 07:10:34 UTC (rev 28)
@@ -162,7 +162,7 @@
continue;
// if the component still has an auto-Id assigned fix it
- child.setId(ComponentFactory.fixAutoId(child.getUuid()));
+ child.setId(ComponentFactory.fixAutoId(child.getId()));
// add the Component to the designer Tree
addComponentToTree(tree, child);
@@ -280,7 +280,7 @@
// set the item's Id, by using the Component's
// Id plus the prefix 'id_'
- item.setId("id_" + canvasComponent.getUuid());
+ item.setId("id_" + canvasComponent.getId());
// create a new Treerow that will contain
// the Component's Id with a small-scale image
@@ -291,7 +291,7 @@
// create the Id cell
Treecell cell = new Treecell();
row.appendChild(cell);
- Label lbl = new Label(canvasComponent.getUuid() + " [" + ComponentFactory.getSimpleClassName(canvasComponent) + "]");
+ Label lbl = new Label(canvasComponent.getId() + " [" + ComponentFactory.getSimpleClassName(canvasComponent) + "]");
cell.appendChild(lbl);
row.setDraggable("treeItem");
row.setDroppable("treeItem, toolkitComponent");
Modified: trunk/src/org/zerokode/designer/model/ComponentFactory.java
===================================================================
--- trunk/src/org/zerokode/designer/model/ComponentFactory.java 2007-11-20 02:16:00 UTC (rev 27)
+++ trunk/src/org/zerokode/designer/model/ComponentFactory.java 2007-12-19 07:10:34 UTC (rev 28)
@@ -91,7 +91,7 @@
}
// assign the component an Id
- newComponent.setId(fixAutoId(newComponent.getUuid()));
+ newComponent.setId(fixAutoId(newComponent.getId()));
// return the newly created component
return newComponent;
Modified: trunk/src/org/zerokode/designer/model/ZUMLModel.java
===================================================================
--- trunk/src/org/zerokode/designer/model/ZUMLModel.java 2007-11-20 02:16:00 UTC (rev 27)
+++ trunk/src/org/zerokode/designer/model/ZUMLModel.java 2007-12-19 07:10:34 UTC (rev 28)
@@ -170,7 +170,7 @@
domElement = new Element(StringUtils.lowerCase(ComponentFactory.getSimpleClassName(cmp)));
// get the component's Id
- String sId = cmp.getUuid();
+ String sId = cmp.getId();
// if the Id is auto-generated by the framework,
// it cannot be used for components that will be re-loaded
@@ -385,7 +385,7 @@
{
// get the parent iDOM Element using the parent
// component's Id as the search criterion
- Element domParentElement = getElementById(ComponentFactory.fixAutoId(component.getParent().getUuid()));
+ Element domParentElement = getElementById(ComponentFactory.fixAutoId(component.getParent().getId()));
// append the new Element to the parent
if (domParentElement != null)
@@ -482,7 +482,7 @@
return null;
// locate and return the Element representation
- return getElementById(element.getUuid());
+ return getElementById(element.getId());
}
/**
Modified: trunk/src/org/zerokode/designer/ui/DesignerCanvas.java
===================================================================
--- trunk/src/org/zerokode/designer/ui/DesignerCanvas.java 2007-11-20 02:16:00 UTC (rev 27)
+++ trunk/src/org/zerokode/designer/ui/DesignerCanvas.java 2007-12-19 07:10:34 UTC (rev 28)
@@ -9,6 +9,7 @@
import org.zerokode.designer.model.ComponentFactory;
import org.zerokode.designer.model.ZUMLModel;
import org.zkoss.idom.Document;
+import org.zkoss.idom.util.IDOMs;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Components;
import org.zkoss.zk.ui.Executions;
@@ -136,8 +137,9 @@
// create the component model described in the '*.zul' file
// onto the designer Canvas
//Executions.createComponentsDirectly(modelDocument, null, this, null);
- Executions.createComponentsDirectly(modelDocument, null, this, null);
+ Executions.createComponentsDirectly(modelDocument, null, this, null);
+
// synchronize the Tree with the model
if (bSynchronizeTree)
getDesigner().getSynchronizer().synchronizeTreeWithCanvas(this);
@@ -163,7 +165,8 @@
_locatedComponent = null;
- locateComponent(this.getRoot(), sId);
+ //locateComponent(this.getRoot(), sId);
+ locateComponent(this, sId);
return _locatedComponent;
}
@@ -219,8 +222,7 @@
if (child == null)
continue;
-
- if (child.getUuid().equals(sId))
+ if (child.getId().equals(sId))
{
_locatedComponent = child;
break;
@@ -285,13 +287,16 @@
{
// convert the current model into a ZUML Document
// create a model-to-ZUML convertor instance
+ try{
ZUMLModel model = new ZUMLModel((Component) getChildren().get(0));
-
// reload the model onto the canvas
loadModelFromDocument(model.getZUMLDocument(), true);
// clean up
model.dispose();
+ }catch(Exception x){
+ x.printStackTrace();
+ }
}
/* (non-Javadoc)
Modified: trunk/src/org/zerokode/designer/ui/DesignerTree.java
===================================================================
--- trunk/src/org/zerokode/designer/ui/DesignerTree.java 2007-11-20 02:16:00 UTC (rev 27)
+++ trunk/src/org/zerokode/designer/ui/DesignerTree.java 2007-12-19 07:10:34 UTC (rev 28)
@@ -667,7 +667,7 @@
Treeitem selectedItem = _tree.getSelectedItem();
Treeitem root = (Treeitem) _tree.getItems().toArray()[0];
- if (selectedItem.getUuid().equals(root.getUuid()))
+ if (selectedItem.getId().equals(root.getId()))
{
// display an error message and exit
Messagebox.show("Root component cannot be deleted", "Error", Messagebox.OK, Messagebox.ERROR);
Modified: trunk/src/org/zerokode/designer/ui/PropertiesWindow.java
===================================================================
--- trunk/src/org/zerokode/designer/ui/PropertiesWindow.java 2007-11-20 02:16:00 UTC (rev 27)
+++ trunk/src/org/zerokode/designer/ui/PropertiesWindow.java 2007-12-19 07:10:34 UTC (rev 28)
@@ -12,6 +12,7 @@
import org.zerokode.designer.IDisposable;
import org.zerokode.designer.model.ComponentFactory;
import org.zerokode.designer.model.ZUMLModel;
+import org.zkoss.idom.util.IDOMs;
import org.zkoss.zk.ui.AbstractComponent;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Components;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
