GWT reorg part 2
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1613 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/client/AfeClient-compile b/frontend/client/AfeClient-compile
index ef8d64c..c92b44f 100755
--- a/frontend/client/AfeClient-compile
+++ b/frontend/client/AfeClient-compile
@@ -4,4 +4,4 @@
java \
-cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar" \
-Djava.awt.headless=true \
- com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" afeclient.ClientMain
+ com.google.gwt.dev.GWTCompiler -out "$APPDIR/www" "$@" autotest.AfeClient
diff --git a/frontend/client/AfeClient-shell b/frontend/client/AfeClient-shell
index 39dae72..07e2261 100755
--- a/frontend/client/AfeClient-shell
+++ b/frontend/client/AfeClient-shell
@@ -1,4 +1,4 @@
#!/bin/sh
APPDIR=`dirname $0`;
GWTDIR=`$APPDIR/gwt_dir`;
-java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" "$@" http://localhost:8000/afe/server/afeclient.ClientMain/ClientMain.html;
+java -cp "$APPDIR/src:$APPDIR/bin:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell -out "$APPDIR/www" "$@" http://localhost:8000/afe/server/autotest.AfeClient/AfeClient.html;
diff --git a/frontend/client/AfeClient.launch b/frontend/client/AfeClient.launch
index b5346be..e3e5d6b 100644
--- a/frontend/client/AfeClient.launch
+++ b/frontend/client/AfeClient.launch
@@ -15,6 +15,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www http://localhost:8000/afe/server/afeclient.ClientMain/ClientMain.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www http://localhost:8000/afe/server/autotest.AfeClient/AfeClient.html"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AfeClient"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
</launchConfiguration>
diff --git a/frontend/client/src/autotest/afe/ClientMain.java b/frontend/client/src/autotest/afe/AfeClient.java
similarity index 100%
rename from frontend/client/src/autotest/afe/ClientMain.java
rename to frontend/client/src/autotest/afe/AfeClient.java
diff --git a/frontend/client/src/autotest/afe/AfeUtils.java b/frontend/client/src/autotest/afe/AfeUtils.java
new file mode 100644
index 0000000..fc3a8b6
--- /dev/null
+++ b/frontend/client/src/autotest/afe/AfeUtils.java
@@ -0,0 +1,59 @@
+package autotest.afe;
+
+import com.google.gwt.json.client.JSONArray;
+import com.google.gwt.json.client.JSONObject;
+import com.google.gwt.json.client.JSONString;
+
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * Utility methods.
+ */
+public class AfeUtils {
+ public static final String PLATFORM_SUFFIX = " (platform)";
+
+ public static final ClassFactory factory = new SiteClassFactory();
+
+ public static String formatStatusCounts(JSONObject counts, String joinWith) {
+ String result = "";
+ Set statusSet = counts.keySet();
+ for (Iterator i = statusSet.iterator(); i.hasNext();) {
+ String status = (String) i.next();
+ int count = (int) counts.get(status).isNumber().getValue();
+ result += Integer.toString(count) + " " + status;
+ if (i.hasNext())
+ result += joinWith;
+ }
+ return result;
+ }
+
+ public static String[] getLabelStrings() {
+ StaticDataRepository staticData = StaticDataRepository.getRepository();
+ JSONArray labels = staticData.getData("labels").isArray();
+ String[] result = new String[labels.size()];
+ for (int i = 0; i < labels.size(); i++) {
+ JSONObject label = labels.get(i).isObject();
+ String name = label.get("name").isString().stringValue();
+ boolean platform = label.get("platform").isNumber().getValue() != 0;
+ if (platform) {
+ name += PLATFORM_SUFFIX;
+ }
+ result[i] = name;
+ }
+ return result;
+ }
+
+ public static String decodeLabelName(String labelName) {
+ if (labelName.endsWith(PLATFORM_SUFFIX)) {
+ int nameLength = labelName.length() - PLATFORM_SUFFIX.length();
+ return labelName.substring(0, nameLength);
+ }
+ return labelName;
+ }
+
+ public static JSONString getLockedText(JSONObject host) {
+ boolean locked = host.get("locked").isNumber().getValue() > 0;
+ return new JSONString(locked ? "Yes" : "No");
+ }
+}
diff --git a/frontend/client/src/autotest/afe/CustomHistory.java b/frontend/client/src/autotest/common/CustomHistory.java
similarity index 100%
rename from frontend/client/src/autotest/afe/CustomHistory.java
rename to frontend/client/src/autotest/common/CustomHistory.java
diff --git a/frontend/client/src/autotest/afe/JSONArrayList.java b/frontend/client/src/autotest/common/JSONArrayList.java
similarity index 100%
rename from frontend/client/src/autotest/afe/JSONArrayList.java
rename to frontend/client/src/autotest/common/JSONArrayList.java
diff --git a/frontend/client/src/autotest/afe/JsonRpcCallback.java b/frontend/client/src/autotest/common/JsonRpcCallback.java
similarity index 100%
rename from frontend/client/src/autotest/afe/JsonRpcCallback.java
rename to frontend/client/src/autotest/common/JsonRpcCallback.java
diff --git a/frontend/client/src/autotest/afe/JsonRpcProxy.java b/frontend/client/src/autotest/common/JsonRpcProxy.java
similarity index 100%
rename from frontend/client/src/autotest/afe/JsonRpcProxy.java
rename to frontend/client/src/autotest/common/JsonRpcProxy.java
diff --git a/frontend/client/src/autotest/afe/SimpleCallback.java b/frontend/client/src/autotest/common/SimpleCallback.java
similarity index 100%
rename from frontend/client/src/autotest/afe/SimpleCallback.java
rename to frontend/client/src/autotest/common/SimpleCallback.java
diff --git a/frontend/client/src/autotest/afe/UnmodifiableSublistView.java b/frontend/client/src/autotest/common/UnmodifiableSublistView.java
similarity index 100%
rename from frontend/client/src/autotest/afe/UnmodifiableSublistView.java
rename to frontend/client/src/autotest/common/UnmodifiableSublistView.java
diff --git a/frontend/client/src/autotest/afe/Utils.java b/frontend/client/src/autotest/common/Utils.java
similarity index 100%
rename from frontend/client/src/autotest/afe/Utils.java
rename to frontend/client/src/autotest/common/Utils.java
diff --git a/frontend/client/src/autotest/afe/CustomTabPanel.java b/frontend/client/src/autotest/common/ui/CustomTabPanel.java
similarity index 100%
rename from frontend/client/src/autotest/afe/CustomTabPanel.java
rename to frontend/client/src/autotest/common/ui/CustomTabPanel.java
diff --git a/frontend/client/src/autotest/afe/DetailView.java b/frontend/client/src/autotest/common/ui/DetailView.java
similarity index 100%
rename from frontend/client/src/autotest/afe/DetailView.java
rename to frontend/client/src/autotest/common/ui/DetailView.java
diff --git a/frontend/client/src/autotest/afe/ElementWidget.java b/frontend/client/src/autotest/common/ui/ElementWidget.java
similarity index 100%
rename from frontend/client/src/autotest/afe/ElementWidget.java
rename to frontend/client/src/autotest/common/ui/ElementWidget.java
diff --git a/frontend/client/src/autotest/afe/NotifyManager.java b/frontend/client/src/autotest/common/ui/NotifyManager.java
similarity index 100%
rename from frontend/client/src/autotest/afe/NotifyManager.java
rename to frontend/client/src/autotest/common/ui/NotifyManager.java
diff --git a/frontend/client/src/autotest/afe/Paginator.java b/frontend/client/src/autotest/common/ui/Paginator.java
similarity index 100%
rename from frontend/client/src/autotest/afe/Paginator.java
rename to frontend/client/src/autotest/common/ui/Paginator.java
diff --git a/frontend/client/src/autotest/afe/SimpleHyperlink.java b/frontend/client/src/autotest/common/ui/SimpleHyperlink.java
similarity index 100%
rename from frontend/client/src/autotest/afe/SimpleHyperlink.java
rename to frontend/client/src/autotest/common/ui/SimpleHyperlink.java
diff --git a/frontend/client/src/autotest/afe/TabView.java b/frontend/client/src/autotest/common/ui/TabView.java
similarity index 100%
rename from frontend/client/src/autotest/afe/TabView.java
rename to frontend/client/src/autotest/common/ui/TabView.java