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 2009/11/20 15:19:12 UTC
svn commit: r882565 - in /myfaces/tobago/trunk/example: ./ data/ data/src/
data/src/main/ data/src/main/java/ data/src/main/java/org/
data/src/main/java/org/apache/ data/src/main/java/org/apache/myfaces/
data/src/main/java/org/apache/myfaces/tobago/ da...
Author: lofwyr
Date: Fri Nov 20 14:19:07 2009
New Revision: 882565
URL: http://svn.apache.org/viewvc?rev=882565&view=rev
Log:
TOBAGO-412: Cleanup
- rename classes of tcs:numberSlider to valid naming conventions
Added:
myfaces/tobago/trunk/example/data/ (with props)
myfaces/tobago/trunk/example/data/pom.xml
- copied, changed from r882081, myfaces/tobago/trunk/example/addressbook/lib/pom.xml
myfaces/tobago/trunk/example/data/src/
myfaces/tobago/trunk/example/data/src/main/
myfaces/tobago/trunk/example/data/src/main/java/
myfaces/tobago/trunk/example/data/src/main/java/org/
myfaces/tobago/trunk/example/data/src/main/java/org/apache/
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Planet.java
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Salutation.java
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SalutationConverter.java
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Solar.java
myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java
myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/SheetController.java
myfaces/tobago/trunk/example/test/src/main/webapp/tc/sheet/
myfaces/tobago/trunk/example/test/src/main/webapp/tc/sheet/sheet-simple.xhtml
Removed:
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/Salutation.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/SalutationConverter.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Planet.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/Solar.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/solar/SolarObject.java
Modified:
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/example/experimental/pom.xml
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java
myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java
myfaces/tobago/trunk/example/pom.xml
myfaces/tobago/trunk/example/test/pom.xml
myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/faces-config.xml
Propchange: myfaces/tobago/trunk/example/data/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 20 14:19:07 2009
@@ -0,0 +1,8 @@
+*.iml
+*.iws
+*.ipr
+*.log
+target
+.classpath
+.project
+.settings
Copied: myfaces/tobago/trunk/example/data/pom.xml (from r882081, myfaces/tobago/trunk/example/addressbook/lib/pom.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/data/pom.xml?p2=myfaces/tobago/trunk/example/data/pom.xml&p1=myfaces/tobago/trunk/example/addressbook/lib/pom.xml&r1=882081&r2=882565&rev=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/lib/pom.xml (original)
+++ myfaces/tobago/trunk/example/data/pom.xml Fri Nov 20 14:19:07 2009
@@ -19,186 +19,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-example-addressbook</artifactId>
+ <artifactId>tobago-example</artifactId>
<version>1.5.0-alpha-2-SNAPSHOT</version>
</parent>
- <artifactId>tobago-example-addressbook-lib</artifactId>
+ <artifactId>tobago-example-data</artifactId>
<packaging>jar</packaging>
- <name>Example Addressbook Library</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <java classname="org.apache.openjpa.enhance.PCEnhancer" classpathref="maven.runtime.classpath" dir="target/classes" fork="true" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <name>Data for Examples</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/addressbook/lib</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/addressbook/lib</developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/lib</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/data</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/data</developerConnection>
+ <url>http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/data</url>
</scm>
- <dependencies>
- <dependency>
- <groupId>org.tango-project</groupId>
- <artifactId>tango-icon-theme</artifactId>
- <version>0.8.0</version>
- </dependency>
- <!-- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>-->
- <!--dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence</artifactId>
- <version>${openjpa.version}</version>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-persistence-jdbc</artifactId>
- <version>${openjpa.version}</version>
- <exclusions>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!--dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-xmlstore</artifactId>
- <version>${openjpa.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-fileupload</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-charlotteville</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-core</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-facelets</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.3.1.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
- </dependencies>
-
- <properties>
- <openjpa.version>1.0.2</openjpa.version>
- <spring.version>2.5.3</spring.version>
- </properties>
+
</project>
Added: myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Planet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Planet.java?rev=882565&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Planet.java (added)
+++ myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Planet.java Fri Nov 20 14:19:07 2009
@@ -0,0 +1,101 @@
+package org.apache.myfaces.tobago.example.data;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Created 20.09.2002 at 10:54:32.
+ * $Id: Planet.java 578592 2007-09-23 18:51:32Z bommel $
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Planet {
+
+ public static final Planet MERCURY
+ = new Planet("NN", "NN", "NN", "NN", new ArrayList());
+ public static final Planet VENUS
+ = new Planet("NN", "NN", "NN", "NN", new ArrayList());
+ public static final Planet EARTH
+ = new Planet("NN", "NN", "NN", "NN", new ArrayList());
+ public static final Planet MARS
+ = new Planet("6794", "6.421e26", "227940000", "686.98", SolarObject.getSatellites("Mars"));
+
+ private String diameter;
+ private String mass;
+ private String sunDistance;
+ private String timeOfCirculation;
+ private List moons;
+
+ public Planet(Planet planet) {
+ this.diameter = planet.diameter;
+ this.mass = planet.mass;
+ this.sunDistance = planet.sunDistance;
+ this.timeOfCirculation = planet.timeOfCirculation;
+ this.moons = planet.moons;
+ }
+
+ public Planet(String diameter, String mass, String sunDistance,
+ String timeOfCirculation, List moons) {
+ this.diameter = diameter;
+ this.mass = mass;
+ this.sunDistance = sunDistance;
+ this.timeOfCirculation = timeOfCirculation;
+ this.moons = moons;
+ }
+
+ public String getDiameter() {
+ return diameter;
+ }
+
+ public void setDiameter(String diameter) {
+ this.diameter = diameter;
+ }
+
+ public String getMass() {
+ return mass;
+ }
+
+ public void setMass(String mass) {
+ this.mass = mass;
+ }
+
+ public String getSunDistance() {
+ return sunDistance;
+ }
+
+ public void setSunDistance(String sunDistance) {
+ this.sunDistance = sunDistance;
+ }
+
+ public String getTimeOfCirculation() {
+ return timeOfCirculation;
+ }
+
+ public void setTimeOfCirculation(String timeOfCirculation) {
+ this.timeOfCirculation = timeOfCirculation;
+ }
+
+ public List getMoons() {
+ return moons;
+ }
+
+ public void setMoons(List moons) {
+ this.moons = moons;
+ }
+}
Added: myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Salutation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Salutation.java?rev=882565&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Salutation.java (added)
+++ myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Salutation.java Fri Nov 20 14:19:07 2009
@@ -0,0 +1,50 @@
+package org.apache.myfaces.tobago.example.data;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Date: 27.07.2006
+ * Time: 21:21:12
+ */
+public enum Salutation {
+
+ UNKNOWN("basic_itemUnknown"),
+
+ MR("basic_itemMr"),
+
+ MRS("basic_itemMrs");
+
+ private String key;
+
+ Salutation(String key) {
+ this.key = key;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public static Salutation getSalutation(String key) {
+ for (Salutation salutation : values()) {
+ if (salutation.getKey().equals(key)) {
+ return salutation;
+ }
+ }
+ return null;
+ }
+}
Added: myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SalutationConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SalutationConverter.java?rev=882565&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SalutationConverter.java (added)
+++ myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SalutationConverter.java Fri Nov 20 14:19:07 2009
@@ -0,0 +1,41 @@
+package org.apache.myfaces.tobago.example.data;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+
+/*
+ * Date: 01.08.2006
+ * Time: 20:04:26
+ */
+public class SalutationConverter implements Converter {
+
+ public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException {
+ return Salutation.getSalutation(value);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException {
+ if (value instanceof Salutation) {
+ return ((Salutation) value).getKey();
+ }
+ return "";
+ }
+}
Added: myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Solar.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Solar.java?rev=882565&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Solar.java (added)
+++ myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/Solar.java Fri Nov 20 14:19:07 2009
@@ -0,0 +1,39 @@
+package org.apache.myfaces.tobago.example.data;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Solar {
+
+ private List<Planet> planets;
+
+ public Solar() {
+ planets = new ArrayList<Planet>();
+ planets.add(new Planet(Planet.MARS));
+ }
+
+ public List<Planet> getPlanets() {
+ return planets;
+ }
+
+ public void setPlanets(List<Planet> planets) {
+ this.planets = planets;
+ }
+}
Added: myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java?rev=882565&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java (added)
+++ myfaces/tobago/trunk/example/data/src/main/java/org/apache/myfaces/tobago/example/data/SolarObject.java Fri Nov 20 14:19:07 2009
@@ -0,0 +1,259 @@
+package org.apache.myfaces.tobago.example.data;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SolarObject {
+
+ private String name;
+
+ private String number;
+
+ private String orbit;
+
+ private Integer distance;
+
+ private Double period;
+
+ private Double incl;
+
+ private Double eccen;
+
+ private String discoverer;
+
+ private Integer discoverYear;
+
+ private String population;
+
+ public SolarObject(
+ String name, String number, String orbit, Integer distance, Double period, Double incl, Double eccen, String discoverer, Integer discoverYear) {
+ this.name = name;
+ this.number = number;
+ this.orbit = orbit;
+ this.distance = distance;
+ this.period = period;
+ this.incl = incl;
+ this.eccen = eccen;
+ this.discoverer = discoverer;
+ this.discoverYear = discoverYear;
+ this.population = "Earth".equals(name) ? "ca. 6.800.000.000" : "0";
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getNumber() {
+ return number;
+ }
+
+ public void setNumber(String number) {
+ this.number = number;
+ }
+
+ public String getOrbit() {
+ return orbit;
+ }
+
+ public void setOrbit(String orbit) {
+ this.orbit = orbit;
+ }
+
+ public Integer getDistance() {
+ return distance;
+ }
+
+ public void setDistance(Integer distance) {
+ this.distance = distance;
+ }
+
+ public Double getPeriod() {
+ return period;
+ }
+
+ public void setPeriod(Double period) {
+ this.period = period;
+ }
+
+ public Double getIncl() {
+ return incl;
+ }
+
+ public void setIncl(Double incl) {
+ this.incl = incl;
+ }
+
+ public Double getEccen() {
+ return eccen;
+ }
+
+ public void setEccen(Double eccen) {
+ this.eccen = eccen;
+ }
+
+ public String getDiscoverer() {
+ return discoverer;
+ }
+
+ public void setDiscoverer(String discoverer) {
+ this.discoverer = discoverer;
+ }
+
+ public Integer getDiscoverYear() {
+ return discoverYear;
+ }
+
+ public void setDiscoverYear(Integer discoverYear) {
+ this.discoverYear = discoverYear;
+ }
+
+ public String getPopulation() {
+ return population;
+ }
+
+ public void setPopulation(String population) {
+ this.population = population;
+ }
+
+ public boolean isSelectionDisabled() {
+ return number.equals("II");
+ }
+
+ public static SolarObject[] getArray() {
+ return DATA;
+ }
+
+
+ public static List<SolarObject> getList() {
+ SolarObject[] array = getArray();
+ List<SolarObject> list = new ArrayList<SolarObject>(array.length);
+ for (SolarObject object : array) {
+ list.add(object);
+ }
+ return list;
+ }
+
+ public static List<SolarObject> getSatellites(String center) {
+ List<SolarObject> collect = new ArrayList<SolarObject>();
+ SolarObject[] all = getArray();
+ for (SolarObject anAll : all) {
+ if (anAll.getOrbit().equals(center)) {
+ collect.add(anAll);
+ }
+ }
+ return collect;
+ }
+
+ public static final SolarObject[] DATA = {
+ new SolarObject("Sun", "-", "-", 0, 0.0, 0.0, 0.0, "-", null),
+ new SolarObject("Mercury", "I", "Sun", 57910, 87.97, 7.00, 0.21, "-", null),
+ new SolarObject("Venus", "II", "Sun", 108200, 224.70, 3.39, 0.01, "-", null),
+ new SolarObject("Earth", "III", "Sun", 149600, 365.26, 0.00, 0.02, "-", null),
+ new SolarObject("Mars", "IV", "Sun", 227940, 686.98, 1.85, 0.09, "-", null),
+ new SolarObject("Jupiter", "V", "Sun", 778330, 4332.71, 1.31, 0.05, "-", null),
+ new SolarObject("Saturn", "VI", "Sun", 1429400, 10759.50, 2.49, 0.06, "-", null),
+ new SolarObject("Uranus", "VII", "Sun", 2870990, 30685.0, 0.77, 0.05, "Herschel", 1781),
+ new SolarObject("Neptune", "VIII", "Sun", 4504300, 60190.0, 1.77, 0.01, "Adams", 1846),
+ new SolarObject("Pluto", "IX", "Sun", 5913520, 90800.0, 17.15, 0.25, "Tombaugh", 1930),
+ new SolarObject("Moon", "I", "Earth", 384, 27.32, 5.14, 0.05, "-", null),
+ new SolarObject("Phobos", "I", "Mars", 9, 0.32, 1.00, 0.02, "Hall", 1877),
+ new SolarObject("Deimos", "II", "Mars", 23, 1.26, 1.80, 0.00, "Hall", 1877),
+ new SolarObject("Metis", "XVI", "Jupiter", 128, 0.29, 0.00, 0.00, "Synnott", 1979),
+ new SolarObject("Adrastea", "XV", "Jupiter", 129, 0.30, 0.00, 0.00, "Jewitt", 1979),
+ new SolarObject("Amalthea", "V", "Jupiter", 181, 0.50, 0.40, 0.00, "Barnard", 1892),
+ new SolarObject("Thebe", "XIV", "Jupiter", 222, 0.67, 0.80, 0.02, "Synnott", 1979),
+ new SolarObject("Io", "I", "Jupiter", 422, 1.77, 0.04, 0.00, "Galileo", 1610),
+ new SolarObject("Europa", "II", "Jupiter", 671, 3.55, 0.47, 0.01, "Galileo", 1610),
+ new SolarObject("Ganymede", "III", "Jupiter", 1070, 7.15, 0.19, 0.00, "Galileo", 1610),
+ new SolarObject("Callisto", "IV", "Jupiter", 1883, 16.69, 0.28, 0.01, "Galileo", 1610),
+ new SolarObject("Themisto", "XVIII", "Jupiter", 7507, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Leda", "XIII", "Jupiter", 11094, 238.72, 27.00, 0.15, "Kowal", 1974),
+ new SolarObject("Himalia", "VI", "Jupiter", 11480, 250.57, 28.00, 0.16, "Perrine", 1904),
+ new SolarObject("Lysithea", "X", "Jupiter", 11720, 259.22, 29.00, 0.11, "Nicholson", 1938),
+ new SolarObject("Elara", "VII", "Jupiter", 11737, 259.65, 28.00, 0.21, "Perrine", 1905),
+ new SolarObject("Ananke", "XII", "Jupiter", 21200, -631.0, 147.00, 0.17, "Nicholson", 1951),
+ new SolarObject("Carme", "XI", "Jupiter", 22600, -692.0, 163.00, 0.21, "Nicholson", 1938),
+ new SolarObject("Pasiphae", "VIII", "Jupiter", 23500, -735.0, 147.00, 0.38, "Melotte", 1908),
+ new SolarObject("Sinope", "IX", "Jupiter", 23700, -758.0, 153.00, 0.28, "Nicholson", 1914),
+ new SolarObject("Iocaste", "XXIV", "Jupiter", 20216, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Harpalyke", "XXII", "Jupiter", 21132, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Praxidike", "XXVII", "Jupiter", 20964, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Taygete", "XX", "Jupiter", 23312, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Chaldene", "XXI", "Jupiter", 23387, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Kalyke", "XXIII", "Jupiter", 23745, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Callirrhoe", "XVII", "Jupiter", 24100, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Megaclite", "XIX", "Jupiter", 23911, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Isonoe", "XXVI", "Jupiter", 23078, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Erinome", "XXV", "Jupiter", 23168, 0.0, null, null, "Sheppard", 2000),
+ new SolarObject("Pan", "XVIII", "Saturn", 134, 0.58, 0.00, 0.00, "Showalter", 1990),
+ new SolarObject("Atlas", "XV", "Saturn", 138, 0.60, 0.00, 0.00, "Terrile", 1980),
+ new SolarObject("Prometheus", "XVI", "Saturn", 139, 0.61, 0.00, 0.00, "Collins", 1980),
+ new SolarObject("Pandora", "XVII", "Saturn", 142, 0.63, 0.00, 0.00, "Collins", 1980),
+ new SolarObject("Epimetheus", "XI", "Saturn", 151, 0.69, 0.34, 0.01, "Walker", 1980),
+ new SolarObject("Janus", "X", "Saturn", 151, 0.69, 0.14, 0.01, "Dollfus", 1966),
+ new SolarObject("Mimas", "I", "Saturn", 186, 0.94, 1.53, 0.02, "Herschel", 1789),
+ new SolarObject("Enceladus", "II", "Saturn", 238, 1.37, 0.02, 0.00, "Herschel", 1789),
+ new SolarObject("Tethys", "III", "Saturn", 295, 1.89, 1.09, 0.00, "Cassini", 1684),
+ new SolarObject("Telesto", "XIII", "Saturn", 295, 1.89, 0.00, 0.00, "Smith", 1980),
+ new SolarObject("Calypso", "XIV", "Saturn", 295, 1.89, 0.00, 0.00, "Pascu", 1980),
+ new SolarObject("Dione", "IV", "Saturn", 377, 2.74, 0.02, 0.00, "Cassini", 1684),
+ new SolarObject("Helene", "XII", "Saturn", 377, 2.74, 0.20, 0.01, "Laques", 1980),
+ new SolarObject("Rhea", "V", "Saturn", 527, 4.52, 0.35, 0.00, "Cassini", 1672),
+ new SolarObject("Titan", "VI", "Saturn", 1222, 15.95, 0.33, 0.03, "Huygens", 1655),
+ new SolarObject("Hyperion", "VII", "Saturn", 1481, 21.28, 0.43, 0.10, "Bond", 1848),
+ new SolarObject("Iapetus", "VIII", "Saturn", 3561, 79.33, 14.72, 0.03, "Cassini", 1671),
+ new SolarObject("Phoebe", "IX", "Saturn", 12952, -550.48, 175.30, 0.16, "Pickering", 1898),
+ new SolarObject("Cordelia", "VI", "Uranus", 50, 0.34, 0.14, 0.00, "Voyager 2", 1986),
+ new SolarObject("Ophelia", "VII", "Uranus", 54, 0.38, 0.09, 0.00, "Voyager 2", 1986),
+ new SolarObject("Bianca", "VIII", "Uranus", 59, 0.43, 0.16, 0.00, "Voyager 2", 1986),
+ new SolarObject("Cressida", "IX", "Uranus", 62, 0.46, 0.04, 0.00, "Voyager 2", 1986),
+ new SolarObject("Desdemona", "X", "Uranus", 63, 0.47, 0.16, 0.00, "Voyager 2", 1986),
+ new SolarObject("Juliet", "XI", "Uranus", 64, 0.49, 0.06, 0.00, "Voyager 2", 1986),
+ new SolarObject("Portia", "XII", "Uranus", 66, 0.51, 0.09, 0.00, "Voyager 2", 1986),
+ new SolarObject("Rosalind", "XIII", "Uranus", 70, 0.56, 0.28, 0.00, "Voyager 2", 1986),
+ new SolarObject("Belinda", "XIV", "Uranus", 75, 0.62, 0.03, 0.00, "Voyager 2", 1986),
+ new SolarObject("1986U10", "", "Uranus", 76, 0.64, null, null, "Karkoschka", 1999),
+ new SolarObject("Puck", "XV", "Uranus", 86, 0.76, 0.31, 0.00, "Voyager 2", 1985),
+ new SolarObject("Miranda", "V", "Uranus", 130, 1.41, 4.22, 0.00, "Kuiper", 1948),
+ new SolarObject("Ariel", "I", "Uranus", 191, 2.52, 0.00, 0.00, "Lassell", 1851),
+ new SolarObject("Umbriel", "II", "Uranus", 266, 4.14, 0.00, 0.00, "Lassell", 1851),
+ new SolarObject("Titania", "III", "Uranus", 436, 8.71, 0.00, 0.00, "Herschel", 1787),
+ new SolarObject("Oberon", "IV", "Uranus", 583, 13.46, 0.00, 0.00, "Herschel", 1787),
+ new SolarObject("Caliban", "XVI", "Uranus", 7169, -580., 140., 0.08, "Gladman", 1997),
+ new SolarObject("Stephano", "XX", "Uranus", 7948, -674., 143., 0.24, "Gladman", 1999),
+ new SolarObject("Sycorax", "XVII", "Uranus", 12213, -1289., 153., 0.51, "Nicholson", 1997),
+ new SolarObject("Prospero", "XVIII", "Uranus", 16568, -2019., 152., 0.44, "Holman", 1999),
+ new SolarObject("Setebos", "XIX", "Uranus", 17681, -2239., 158., 0.57, "Kavelaars", 1999),
+ new SolarObject("Naiad", "III", "Neptune", 48, 0.29, 0.00, 0.00, "Voyager 2", 1989),
+ new SolarObject("Thalassa", "IV", "Neptune", 50, 0.31, 4.50, 0.00, "Voyager 2", 1989),
+ new SolarObject("Despina", "V", "Neptune", 53, 0.33, 0.00, 0.00, "Voyager 2", 1989),
+ new SolarObject("Galatea", "VI", "Neptune", 62, 0.43, 0.00, 0.00, "Voyager 2", 1989),
+ new SolarObject("Larissa", "VII", "Neptune", 74, 0.55, 0.00, 0.00, "Reitsema", 1989),
+ new SolarObject("Proteus", "VIII", "Neptune", 118, 1.12, 0.00, 0.00, "Voyager 2", 1989),
+ new SolarObject("Triton", "I", "Neptune", 355, -5.88, 157.00, 0.00, "Lassell", 1846),
+ new SolarObject("Nereid", "II", "Neptune", 5513, 360.13, 29.00, 0.75, "Kuiper", 1949),
+ new SolarObject("Charon", "I", "Pluto", 20, 6.39, 98.80, 0.00, "Christy", 1978)
+ };
+
+}
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Fri Nov 20 14:19:07 2009
@@ -93,6 +93,11 @@
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-example-data</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-charlotteville</artifactId>
<version>${project.version}</version>
</dependency>
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Fri Nov 20 14:19:07 2009
@@ -30,8 +30,8 @@
import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.event.TabChangeListener;
-import org.apache.myfaces.tobago.example.demo.model.solar.Solar;
-import org.apache.myfaces.tobago.example.demo.model.solar.SolarObject;
+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;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Fri Nov 20 14:19:07 2009
@@ -19,13 +19,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.UIData;
+import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import org.apache.myfaces.tobago.event.SortActionEvent;
-import org.apache.myfaces.tobago.example.demo.model.Salutation;
-import org.apache.myfaces.tobago.example.demo.model.solar.SolarObject;
+import org.apache.myfaces.tobago.example.data.Salutation;
+import org.apache.myfaces.tobago.example.data.SolarObject;
import org.apache.myfaces.tobago.model.SelectItem;
import org.apache.myfaces.tobago.model.SheetState;
@@ -40,11 +40,6 @@
import java.util.Date;
import java.util.List;
-/*
- * Created 19.05.2004 18:47:47.
- * $Id$
- */
-
public class OverviewController {
private static final Log LOG = LogFactory.getLog(OverviewController.class);
@@ -163,7 +158,7 @@
public void sheetSorter(ActionEvent event) {
if (event instanceof SortActionEvent) {
SortActionEvent sortEvent = (SortActionEvent) event;
- UIData sheet = (UIData) sortEvent.getComponent();
+ UISheet sheet = (UISheet) sortEvent.getComponent();
SheetState sheetState
= sheet.getSheetState(FacesContext.getCurrentInstance());
String columnId = sheetState.getSortedColumnId();
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml Fri Nov 20 14:19:07 2009
@@ -47,7 +47,7 @@
<converter>
<converter-id>salutationId</converter-id>
- <converter-class>org.apache.myfaces.tobago.example.demo.model.SalutationConverter</converter-class>
+ <converter-class>org.apache.myfaces.tobago.example.data.SalutationConverter</converter-class>
</converter>
<managed-bean>
Modified: myfaces/tobago/trunk/example/experimental/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/pom.xml?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/pom.xml (original)
+++ myfaces/tobago/trunk/example/experimental/pom.xml Fri Nov 20 14:19:07 2009
@@ -52,6 +52,11 @@
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-example-data</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-fileupload</artifactId>
<version>${project.version}</version>
</dependency>
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/SessionController.java Fri Nov 20 14:19:07 2009
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.UIData;
+import org.apache.myfaces.tobago.component.UISheet;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.model.SelectItem;
@@ -114,8 +114,8 @@
}
}
while ((component = component.getParent()) != null) {
- if (component instanceof UIData) {
- LOG.error(((UIData) component).getRowIndex());
+ if (component instanceof UISheet) {
+ LOG.error(((UISheet) component).getRowIndex());
}
}
}
Modified: myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java (original)
+++ myfaces/tobago/trunk/example/experimental/src/main/java/org/apache/myfaces/tobago/example/test/TestBean.java Fri Nov 20 14:19:07 2009
@@ -17,32 +17,33 @@
* limitations under the License.
*/
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
import org.apache.commons.fileupload.FileItem;
-import org.apache.myfaces.tobago.component.UIData;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.UIColumn;
import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIMenu;
import org.apache.myfaces.tobago.component.UIMenuCommand;
+import org.apache.myfaces.tobago.component.UISheet;
+import org.apache.myfaces.tobago.example.data.SolarObject;
+import javax.faces.application.Application;
import javax.faces.component.UIOutput;
import javax.faces.component.UIPanel;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.el.MethodBinding;
-import javax.faces.application.Application;
-import java.sql.Statement;
-import java.sql.DriverManager;
+import javax.faces.el.ValueBinding;
+import java.io.IOException;
import java.sql.Connection;
+import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Types;
-import java.util.Map;
import java.util.Date;
-import java.io.IOException;
+import java.util.Map;
/*
* Date: 18.02.2006
@@ -64,7 +65,7 @@
private String discoverer;
private String discoverYear;
private FileItem file;
- private UIData table;
+ private UISheet table;
private String value;
private Date date;
private Date date1;
@@ -169,7 +170,7 @@
+ "discoverYear INTEGER)");
PreparedStatement ps =
connection.prepareStatement("insert into solarObject values (?,?,?,?,?,?,?,?,?)");
- for (String[] aSTRINGS : STRINGS) {
+ for (String[] aSTRINGS : SolarObject.DATA) {
for (int j = 0; j < aSTRINGS.length; j++) {
ps.setString(j + 1, aSTRINGS[j]);
}
@@ -193,11 +194,11 @@
}
- public UIData getTable() {
+ public UISheet getTable() {
return table;
}
- public void setTable(UIData table) {
+ public void setTable(UISheet table) {
this.table = table;
if (table.getChildCount() == 0) {
if (table.getVar() == null) {
@@ -374,99 +375,4 @@
}
return resultSet;
}
-
-
- private static final String[][] STRINGS =
- {
- {"Sun", "-", "-", "0", "0", "0", "0", "-", "0"},
- {"Mercury", "I", "Sun", "57910", "87.97", "7.00", "0.21", "-", null},
- {"Venus", "II", "Sun", "108200", "224.70", "3.39", "0.01", "-", null},
- {"Earth", "III", "Sun", "149600", "365.26", "0.00", "0.02", "-", null},
- {"Mars", "IV", "Sun", "227940", "686.98", "1.85", "0.09", "-", null},
- {"Jupiter", "V", "Sun", "778330", "4332.71", "1.31", "0.05", "-", null},
- {"Saturn", "VI", "Sun", "1429400", "10759.50", "2.49", "0.06", "-", null},
- {"Uranus", "VII", "Sun", "2870990", "30685.00", "0.77", "0.05", "Herschel", "1781"},
- {"Neptune", "VIII", "Sun", "4504300", "60190.00", "1.77", "0.01", "Adams", "1846"},
- {"Pluto", "IX", "Sun", "5913520", "90800", "17.15", "0.25", "Tombaugh", "1930"},
- {"Moon", "I", "Earth", "384", "27.32", "5.14", "0.05", "-", null},
- {"Phobos", "I", "Mars", "9", "0.32", "1.00", "0.02", "Hall", "1877"},
- {"Deimos", "II", "Mars", "23", "1.26", "1.80", "0.00", "Hall", "1877"},
- {"Metis", "XVI", "Jupiter", "128", "0.29", "0.00", "0.00", "Synnott", "1979"},
- {"Adrastea", "XV", "Jupiter", "129", "0.30", "0.00", "0.00", "Jewitt", "1979"},
- {"Amalthea", "V", "Jupiter", "181", "0.50", "0.40", "0.00", "Barnard", "1892"},
- {"Thebe", "XIV", "Jupiter", "222", "0.67", "0.80", "0.02", "Synnott", "1979"},
- {"Io", "I", "Jupiter", "422", "1.77", "0.04", "0.00", "Galileo", "1610"},
- {"Europa", "II", "Jupiter", "671", "3.55", "0.47", "0.01", "Galileo", "1610"},
- {"Ganymede", "III", "Jupiter", "1070", "7.15", "0.19", "0.00", "Galileo", "1610"},
- {"Callisto", "IV", "Jupiter", "1883", "16.69", "0.28", "0.01", "Galileo", "1610"},
- {"Themisto", "XVIII", "Jupiter", "7507", "0", null, null, "Sheppard", "2000"},
- {"Leda", "XIII", "Jupiter", "11094", "238.72", "27.00", "0.15", "Kowal", "1974"},
- {"Himalia", "VI", "Jupiter", "11480", "250.57", "28.00", "0.16", "Perrine", "1904"},
- {"Lysithea", "X", "Jupiter", "11720", "259.22", "29.00", "0.11", "Nicholson", "1938"},
- {"Elara", "VII", "Jupiter", "11737", "259.65", "28.00", "0.21", "Perrine", "1905"},
- {"Ananke", "XII", "Jupiter", "21200", "-631", "147.00", "0.17", "Nicholson", "1951"},
- {"Carme", "XI", "Jupiter", "22600", "-692", "163.00", "0.21", "Nicholson", "1938"},
- {"Pasiphae", "VIII", "Jupiter", "23500", "-735", "147.00", "0.38", "Melotte", "1908"},
- {"Sinope", "IX", "Jupiter", "23700", "-758", "153.00", "0.28", "Nicholson", "1914"},
- {"Iocaste", "XXIV", "Jupiter", "20216", "0", null, null, "Sheppard", "2000"},
- {"Harpalyke", "XXII", "Jupiter", "21132", "0", null, null, "Sheppard", "2000"},
- {"Praxidike", "XXVII", "Jupiter", "20964", "0", null, null, "Sheppard", "2000"},
- {"Taygete", "XX", "Jupiter", "23312", "0", null, null, "Sheppard", "2000"},
- {"Chaldene", "XXI", "Jupiter", "23387", "0", null, null, "Sheppard", "2000"},
- {"Kalyke", "XXIII", "Jupiter", "23745", "0", null, null, "Sheppard", "2000"},
- {"Callirrhoe", "XVII", "Jupiter", "24100", "0", null, null, "Sheppard", "2000"},
- {"Megaclite", "XIX", "Jupiter", "23911", "0", null, null, "Sheppard", "2000"},
- {"Isonoe", "XXVI", "Jupiter", "23078", "0", null, null, "Sheppard", "2000"},
- {"Erinome", "XXV", "Jupiter", "23168", "0", null, null, "Sheppard", "2000"},
- {"Pan", "XVIII", "Saturn", "134", "0.58", "0.00", "0.00", "Showalter", "1990"},
- {"Atlas", "XV", "Saturn", "138", "0.60", "0.00", "0.00", "Terrile", "1980"},
- {"Prometheus", "XVI", "Saturn", "139", "0.61", "0.00", "0.00", "Collins", "1980"},
- {"Pandora", "XVII", "Saturn", "142", "0.63", "0.00", "0.00", "Collins", "1980"},
- {"Epimetheus", "XI", "Saturn", "151", "0.69", "0.34", "0.01", "Walker", "1980"},
- {"Janus", "X", "Saturn", "151", "0.69", "0.14", "0.01", "Dollfus", "1966"},
- {"Mimas", "I", "Saturn", "186", "0.94", "1.53", "0.02", "Herschel", "1789"},
- {"Enceladus", "II", "Saturn", "238", "1.37", "0.02", "0.00", "Herschel", "1789"},
- {"Tethys", "III", "Saturn", "295", "1.89", "1.09", "0.00", "Cassini", "1684"},
- {"Telesto", "XIII", "Saturn", "295", "1.89", "0.00", "0.00", "Smith", "1980"},
- {"Calypso", "XIV", "Saturn", "295", "1.89", "0.00", "0.00", "Pascu", "1980"},
- {"Dione", "IV", "Saturn", "377", "2.74", "0.02", "0.00", "Cassini", "1684"},
- {"Helene", "XII", "Saturn", "377", "2.74", "0.20", "0.01", "Laques", "1980"},
- {"Rhea", "V", "Saturn", "527", "4.52", "0.35", "0.00", "Cassini", "1672"},
- {"Titan", "VI", "Saturn", "1222", "15.95", "0.33", "0.03", "Huygens", "1655"},
- {"Hyperion", "VII", "Saturn", "1481", "21.28", "0.43", "0.10", "Bond", "1848"},
- {"Iapetus", "VIII", "Saturn", "3561", "79.33", "14.72", "0.03", "Cassini", "1671"},
- {"Phoebe", "IX", "Saturn", "12952", "-550.48", "175.30", "0.16", "Pickering", "1898"},
- {"Cordelia", "VI", "Uranus", "50", "0.34", "0.14", "0.00", "Voyager 2", "1986"},
- {"Ophelia", "VII", "Uranus", "54", "0.38", "0.09", "0.00", "Voyager 2", "1986"},
- {"Bianca", "VIII", "Uranus", "59", "0.43", "0.16", "0.00", "Voyager 2", "1986"},
- {"Cressida", "IX", "Uranus", "62", "0.46", "0.04", "0.00", "Voyager 2", "1986"},
- {"Desdemona", "X", "Uranus", "63", "0.47", "0.16", "0.00", "Voyager 2", "1986"},
- {"Juliet", "XI", "Uranus", "64", "0.49", "0.06", "0.00", "Voyager 2", "1986"},
- {"Portia", "XII", "Uranus", "66", "0.51", "0.09", "0.00", "Voyager 2", "1986"},
- {"Rosalind", "XIII", "Uranus", "70", "0.56", "0.28", "0.00", "Voyager 2", "1986"},
- {"Belinda", "XIV", "Uranus", "75", "0.62", "0.03", "0.00", "Voyager 2", "1986"},
- {"1986U10", "", "Uranus", "76", "0.64", null, null, "Karkoschka", "1999"},
- {"Puck", "XV", "Uranus", "86", "0.76", "0.31", "0.00", "Voyager 2", "1985"},
- {"Miranda", "V", "Uranus", "130", "1.41", "4.22", "0.00", "Kuiper", "1948"},
- {"Ariel", "I", "Uranus", "191", "2.52", "0.00", "0.00", "Lassell", "1851"},
- {"Umbriel", "II", "Uranus", "266", "4.14", "0.00", "0.00", "Lassell", "1851"},
- {"Titania", "III", "Uranus", "436", "8.71", "0.00", "0.00", "Herschel", "1787"},
- {"Oberon", "IV", "Uranus", "583", "13.46", "0.00", "0.00", "Herschel", "1787"},
- {"Caliban", "XVI", "Uranus", "7169", "-580", "140.", "0.08", "Gladman", "1997"},
- {"Stephano", "XX", "Uranus", "7948", "-674", "143.", "0.24", "Gladman", "1999"},
- {"Sycorax", "XVII", "Uranus", "12213", "-1289", "153.", "0.51", "Nicholson", "1997"},
- {"Prospero", "XVIII", "Uranus", "16568", "-2019", "152.", "0.44", "Holman", "1999"},
- {"Setebos", "XIX", "Uranus", "17681", "-2239", "158.", "0.57", "Kavelaars", "1999"},
- {"Naiad", "III", "Neptune", "48", "0.29", "0.00", "0.00", "Voyager 2", "1989"},
- {"Thalassa", "IV", "Neptune", "50", "0.31", "4.50", "0.00", "Voyager 2", "1989"},
- {"Despina", "V", "Neptune", "53", "0.33", "0.00", "0.00", "Voyager 2", "1989"},
- {"Galatea", "VI", "Neptune", "62", "0.43", "0.00", "0.00", "Voyager 2", "1989"},
- {"Larissa", "VII", "Neptune", "74", "0.55", "0.00", "0.00", "Reitsema", "1989"},
- {"Proteus", "VIII", "Neptune", "118", "1.12", "0.00", "0.00", "Voyager 2", "1989"},
- {"Triton", "I", "Neptune", "355", "-5.88", "157.00", "0.00", "Lassell", "1846"},
- {"Nereid", "II", "Neptune", "5513", "360.13", "29.00", "0.75", "Kuiper", "1949"},
- {"Charon", "I", "Pluto", "20", "6.39", "98.80", "0.00", "Christy", "1978"}
- };
-
}
-
Modified: myfaces/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/pom.xml?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/pom.xml (original)
+++ myfaces/tobago/trunk/example/pom.xml Fri Nov 20 14:19:07 2009
@@ -85,6 +85,7 @@
<modules>
<module>addressbook</module>
<module>blank</module>
+ <module>data</module>
<module>demo</module>
<module>nonfacesrequest</module>
<module>experimental</module>
@@ -96,6 +97,7 @@
<modules>
<module>addressbook</module>
<module>blank</module>
+ <module>data</module>
<module>demo</module>
<module>nonfacesrequest</module>
<module>portlet</module>
@@ -113,6 +115,7 @@
<id>release</id>
<modules>
<module>blank</module>
+ <module>data</module>
<module>demo</module>
</modules>
</profile>
@@ -120,6 +123,7 @@
<id>generate-assembly</id>
<modules>
<module>blank</module>
+ <module>data</module>
<module>demo</module>
<module>tobago-example-assembly</module>
</modules>
Modified: myfaces/tobago/trunk/example/test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/pom.xml?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/pom.xml (original)
+++ myfaces/tobago/trunk/example/test/pom.xml Fri Nov 20 14:19:07 2009
@@ -118,6 +118,11 @@
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-example-data</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!--dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-example</artifactId>
Added: myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/SheetController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/SheetController.java?rev=882565&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/SheetController.java (added)
+++ myfaces/tobago/trunk/example/test/src/main/java/org/apache/myfaces/tobago/example/test/SheetController.java Fri Nov 20 14:19:07 2009
@@ -0,0 +1,29 @@
+package org.apache.myfaces.tobago.example.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.example.data.SolarObject;
+
+public class SheetController {
+
+ private SolarObject[] solarArray = SolarObject.getArray();
+
+ public SolarObject[] getSolarArray() {
+ return solarArray;
+ }
+}
Modified: myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/faces-config.xml?rev=882565&r1=882564&r2=882565&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/WEB-INF/faces-config.xml Fri Nov 20 14:19:07 2009
@@ -83,6 +83,12 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>sheet</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.tobago.example.test.SheetController</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
<navigation-rule>
<navigation-case>
<from-outcome>navigation</from-outcome>
Added: myfaces/tobago/trunk/example/test/src/main/webapp/tc/sheet/sheet-simple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tc/sheet/sheet-simple.xhtml?rev=882565&view=auto
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tc/sheet/sheet-simple.xhtml (added)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tc/sheet/sheet-simple.xhtml Fri Nov 20 14:19:07 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<f:view
+ xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <tc:page>
+ <tc:gridLayoutConstraint width="600px" height="600px"/>
+
+ <tc:sheet value="#{sheet.solarArray}" id="sheet" columns="*;*" var="luminary" rows="5"
+ showRowRange="left" showPageRange="right" showDirectLinks="center">
+ <tc:column label="Name" id="name">
+ <tc:out value="#{luminary.name}"/>
+ </tc:column>
+ <tc:column label="Orbit Of" id="orbit">
+ <tc:out value="#{luminary.orbit}"/>
+ </tc:column>
+ </tc:sheet>
+
+ <tc:script file="script/test-utils.js"/>
+ <!--todo-->
+ <tc:script onload="checkLayout('page:todo', 0, 0, 600, 14);"/>
+
+ </tc:page>
+</f:view>