Menu
▾
▴
[Zerokode-svn-log] SF.net SVN: zerokode: [24] trunk/src/org/zerokode/designer
|
From: <jum...@us...> - 2007-11-20 01:59:56
|
Revision: 24
http://zerokode.svn.sourceforge.net/zerokode/?rev=24&view=rev
Author: jumperchen
Date: 2007-11-19 18:00:01 -0800 (Mon, 19 Nov 2007)
Log Message:
-----------
Update for ZK 3.0.0 version
Modified Paths:
--------------
trunk/src/org/zerokode/designer/events/listeners/TreeEventListener.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/Designer.java
trunk/src/org/zerokode/designer/ui/DesignerCanvas.java
Modified: trunk/src/org/zerokode/designer/events/listeners/TreeEventListener.java
===================================================================
--- trunk/src/org/zerokode/designer/events/listeners/TreeEventListener.java 2007-11-20 01:56:51 UTC (rev 23)
+++ trunk/src/org/zerokode/designer/events/listeners/TreeEventListener.java 2007-11-20 02:00:01 UTC (rev 24)
@@ -192,7 +192,7 @@
// add the new component as a child
// to the selected one
cmpTarget.appendChild(newComponent);
-
+ cmpTarget.invalidate(); // avoid some side effect. add By Jumper
// apply the post creation rules of the component
RulesResult result = RulesEngine.applyRules(newComponent, RulesEngine.CREATION_RULES);
Modified: trunk/src/org/zerokode/designer/model/CanvasTreeSynchronizer.java
===================================================================
--- trunk/src/org/zerokode/designer/model/CanvasTreeSynchronizer.java 2007-11-20 01:56:51 UTC (rev 23)
+++ trunk/src/org/zerokode/designer/model/CanvasTreeSynchronizer.java 2007-11-20 02:00:01 UTC (rev 24)
@@ -162,7 +162,7 @@
continue;
// if the component still has an auto-Id assigned fix it
- child.setId(ComponentFactory.fixAutoId(child.getId()));
+ child.setId(ComponentFactory.fixAutoId(child.getUuid()));
// 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.getId());
+ item.setId("id_" + canvasComponent.getUuid());
// 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.getId() + " [" + ComponentFactory.getSimpleClassName(canvasComponent) + "]");
+ Label lbl = new Label(canvasComponent.getUuid() + " [" + 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 01:56:51 UTC (rev 23)
+++ trunk/src/org/zerokode/designer/model/ComponentFactory.java 2007-11-20 02:00:01 UTC (rev 24)
@@ -91,7 +91,7 @@
}
// assign the component an Id
- newComponent.setId(fixAutoId(newComponent.getId()));
+ newComponent.setId(fixAutoId(newComponent.getUuid()));
// return the newly created component
return newComponent;
@@ -369,11 +369,8 @@
*/
public static String createNewId()
{
- // get the next available component Id for the current Desktop
- final StringBuffer bufferId = new StringBuffer(12).append("z_");
- Strings.encode(bufferId, new Integer(((DesktopCtrl) Executions.getCurrent().getDesktop()).getNextUuid()));
-
- String sNewId = bufferId.toString();
+ // get the next available component Id for the current Desktop
+ String sNewId = ((DesktopCtrl) Executions.getCurrent().getDesktop()).getNextUuid();
// fix the Id
sNewId = fixAutoId(sNewId);
Modified: trunk/src/org/zerokode/designer/model/ZUMLModel.java
===================================================================
--- trunk/src/org/zerokode/designer/model/ZUMLModel.java 2007-11-20 01:56:51 UTC (rev 23)
+++ trunk/src/org/zerokode/designer/model/ZUMLModel.java 2007-11-20 02:00:01 UTC (rev 24)
@@ -170,7 +170,7 @@
domElement = new Element(StringUtils.lowerCase(ComponentFactory.getSimpleClassName(cmp)));
// get the component's Id
- String sId = cmp.getId();
+ String sId = cmp.getUuid();
// 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().getId()));
+ Element domParentElement = getElementById(ComponentFactory.fixAutoId(component.getParent().getUuid()));
// 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.getId());
+ return getElementById(element.getUuid());
}
/**
Modified: trunk/src/org/zerokode/designer/ui/Designer.java
===================================================================
--- trunk/src/org/zerokode/designer/ui/Designer.java 2007-11-20 01:56:51 UTC (rev 23)
+++ trunk/src/org/zerokode/designer/ui/Designer.java 2007-11-20 02:00:01 UTC (rev 24)
@@ -163,7 +163,6 @@
Vbox vBox = new Vbox();
Vbox vbox2 = new Vbox();
Hbox hBox = new Hbox();
-
hBox.setSpacing("15px");
vBox.setSpacing("35px");
vbox2.setWidth("100%");
@@ -172,7 +171,7 @@
hBox.appendChild(vBox);
hBox.appendChild(vbox2);
-
+ hBox.setWidths("35%,60%");
vBox.appendChild(_toolbar);
vBox.appendChild(_toolkit);
vBox.appendChild(_tree);
Modified: trunk/src/org/zerokode/designer/ui/DesignerCanvas.java
===================================================================
--- trunk/src/org/zerokode/designer/ui/DesignerCanvas.java 2007-11-20 01:56:51 UTC (rev 23)
+++ trunk/src/org/zerokode/designer/ui/DesignerCanvas.java 2007-11-20 02:00:01 UTC (rev 24)
@@ -220,7 +220,7 @@
if (child == null)
continue;
- if (child.getId().equals(sId))
+ if (child.getUuid().equals(sId))
{
_locatedComponent = child;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
