You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/09/17 14:20:31 UTC
svn commit: r998091 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/model/
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/
tobago-example/tobago-example-test/src/main/java/org/apa...
Author: lofwyr
Date: Fri Sep 17 12:20:31 2010
New Revision: 998091
URL: http://svn.apache.org/viewvc?rev=998091&view=rev
Log:
TOBAGO-809:
- TreeState
Added:
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/TreeState.java
- copied, changed from r998023, myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=998091&r1=998090&r2=998091&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Fri Sep 17 12:20:31 2010
@@ -28,7 +28,6 @@ import org.apache.myfaces.tobago.example
import org.apache.myfaces.tobago.example.data.Solar;
import org.apache.myfaces.tobago.example.data.SolarObject;
import org.apache.myfaces.tobago.model.SheetState;
-import org.apache.myfaces.tobago.model.TreeState;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,8 +72,6 @@ public class TobagoDemoController {
private String solarArrayColumnLayout;
- private TreeState treeState;
-
private DefaultMutableTreeNode tree;
private boolean showJunctions;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java?rev=998091&r1=998090&r2=998091&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java Fri Sep 17 12:20:31 2010
@@ -17,7 +17,6 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
-import org.apache.myfaces.tobago.model.TreeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +33,7 @@ public class TreeController {
private DefaultMutableTreeNode tree;
- private TreeState state;
+// private TreeState state;
public TreeController() {
// tree
@@ -74,9 +73,9 @@ public class TreeController {
((Node) temp.getUserObject()).setSelected(true);
// state
- state = new TreeState();
- state.addSelection(temp2);
- state.setMarker(music);
+// state = new TreeState();
+// state.addSelection(temp2);
+// state.setMarker(music);
}
public String action1() {
@@ -99,22 +98,26 @@ public class TreeController {
}
public String createNode() {
+/*
DefaultMutableTreeNode marker = state.getMarker();
if (marker != null) {
marker.insert(new DefaultMutableTreeNode(new Node("New Node")), 0);
} else {
// todo: print a warning or use root?
}
+*/
return null;
}
public String deleteNode() {
+/*
DefaultMutableTreeNode marker = state.getMarker();
if (marker != null) {
marker.removeFromParent();
} else {
// todo: print a warning or use root?
}
+*/
return null;
}
@@ -130,6 +133,7 @@ public class TreeController {
this.tree = tree;
}
+/*
public TreeState getState() {
return state;
}
@@ -137,4 +141,5 @@ public class TreeController {
public void setState(TreeState state) {
this.state = state;
}
+*/
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java?rev=998091&r1=998090&r2=998091&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java Fri Sep 17 12:20:31 2010
@@ -19,7 +19,6 @@ package org.apache.myfaces.tobago.exampl
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.model.TreeState;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
@@ -33,7 +32,6 @@ public class DirectoryBrowser {
private static final Logger LOG = LoggerFactory.getLogger(DirectoryBrowser.class);
private PageItem tree;
- private TreeState state;
private PageItem current;
public DirectoryBrowser() {
@@ -104,12 +102,4 @@ public class DirectoryBrowser {
public void setCurrent(PageItem current) {
this.current = current;
}
-
- public TreeState getState() {
- return state;
- }
-
- public void setState(TreeState state) {
- this.state = state;
- }
}
Copied: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/TreeState.java (from r998023, myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/TreeState.java?p2=myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/TreeState.java&p1=myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java&r1=998023&r2=998091&rev=998091&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/model/TreeState.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/model/TreeState.java Fri Sep 17 12:20:31 2010
@@ -17,10 +17,9 @@ package org.apache.myfaces.tobago.model;
* limitations under the License.
*/
-import javax.swing.tree.DefaultMutableTreeNode;
-
import org.apache.commons.lang.StringUtils;
+import javax.swing.tree.DefaultMutableTreeNode;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
@@ -30,7 +29,9 @@ import java.util.Set;
* 1. selection: selected tree-nodes<br />
* 2. expandState: open/close folder state<br />
* 3. marker: last used action object<br />
+ * @deprecated
*/
+@Deprecated
public class TreeState {
public static final String SEP = ";";