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 2013/11/26 16:00:54 UTC
svn commit: r1545680 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
Author: lofwyr
Date: Tue Nov 26 15:00:54 2013
New Revision: 1545680
URL: http://svn.apache.org/r1545680
Log:
clean up
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java?rev=1545680&r1=1545679&r2=1545680&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java Tue Nov 26 15:00:54 2013
@@ -462,8 +462,10 @@ public final class ComponentUtils {
}
}
-
-
+ /**
+ * @deprecated since 2.0.0
+ */
+ @Deprecated
public static ValueBinding createValueBinding(final String value) {
return FacesContext.getCurrentInstance().getApplication().createValueBinding(value);
}
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=1545680&r1=1545679&r2=1545680&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 Tue Nov 26 15:00:54 2013
@@ -19,9 +19,6 @@
package org.apache.myfaces.tobago.example.demo;
-import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.RendererTypes;
-import org.apache.myfaces.tobago.component.UIIn;
import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.event.TabChangeListener;
@@ -31,13 +28,11 @@ import org.apache.myfaces.tobago.example
import org.apache.myfaces.tobago.model.ExpandedState;
import org.apache.myfaces.tobago.model.SheetState;
import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.apache.myfaces.tobago.util.CreateComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.enterprise.context.SessionScoped;
import javax.faces.application.FacesMessage;
-import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
import javax.faces.context.ExternalContext;
@@ -50,7 +45,6 @@ import javax.servlet.http.HttpSession;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -77,10 +71,6 @@ public class TobagoDemoController implem
private List<SolarObject> solarList;
- private List<UIColumn> solarArrayColumns;
-
- private String solarArrayColumnLayout;
-
private SolarObject currentSolarObject;
private DefaultMutableTreeNode solarTree;
@@ -165,8 +155,6 @@ public class TobagoDemoController implem
solarTree = SolarObject.getTree();
sheetTreeState = new SheetState();
sheetTreeState.setExpandedState(new ExpandedState(1));
- solarArrayColumns = createSolarArrayColumns();
- solarArrayColumnLayout = "3*; 3*; 3*";
tree = CategoryTree.createSample();
final String[] values = {"none", "single", "singleLeafOnly", "multi", "multiLeafOnly"};
@@ -253,28 +241,6 @@ public class TobagoDemoController implem
this.tabChangeListener = tabChangeListener;
}
- private List<UIColumn> createSolarArrayColumns() {
-
- final List<UIColumn> columns = new ArrayList<UIColumn>(3);
-
- final FacesContext facesContext = FacesContext.getCurrentInstance();
- final UIIn in = (UIIn)
- CreateComponentUtils.createComponent(facesContext, UIIn.COMPONENT_TYPE, RendererTypes.IN, "sac1i");
- in.setValueBinding(
- Attributes.VALUE, facesContext.getApplication().createValueBinding("#{luminary.population}"));
-
- columns.add(CreateComponentUtils.createColumn(
- "#{overviewBundle.solarArrayPopulation}", "true", null, in, "sac1"));
-
- columns.add(CreateComponentUtils.createTextColumn(
- "#{overviewBundle.solarArrayDistance}", "true", "right", "#{luminary.distance}", "sac1"));
-
- columns.add(CreateComponentUtils.createTextColumn(
- "#{overviewBundle.solarArrayPeriod}", "true", "right", "#{luminary.period}", "sac1"));
-
- return columns;
- }
-
public static SelectItem[] getSelectItems(final String[] keys, final String bundle) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final SelectItem[] items = new SelectItem[keys.length];
@@ -392,22 +358,6 @@ public class TobagoDemoController implem
this.solarList = solarList;
}
- public List<UIColumn> getSolarArrayColumns() {
- return solarArrayColumns;
- }
-
- public void setSolarArrayColumns(final List<UIColumn> solarArrayColumns) {
- this.solarArrayColumns = solarArrayColumns;
- }
-
- public String getSolarArrayColumnLayout() {
- return solarArrayColumnLayout;
- }
-
- public void setSolarArrayColumnLayout(final String solarArrayColumnLayout) {
- this.solarArrayColumnLayout = solarArrayColumnLayout;
- }
-
public DefaultMutableTreeNode getTree() {
return tree;
}