diff --git a/src/android/Fridge/.classpath b/src/ui/android/.classpath similarity index 100% rename from src/android/Fridge/.classpath rename to src/ui/android/.classpath diff --git a/src/android/Fridge/.project b/src/ui/android/.project similarity index 93% rename from src/android/Fridge/.project rename to src/ui/android/.project index e2fab1991..c24012a32 100644 --- a/src/android/Fridge/.project +++ b/src/ui/android/.project @@ -1,6 +1,6 @@ - Fridge + GF-Android diff --git a/src/android/Fridge/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml similarity index 100% rename from src/android/Fridge/AndroidManifest.xml rename to src/ui/android/AndroidManifest.xml diff --git a/src/android/Fridge/default.properties b/src/ui/android/default.properties similarity index 100% rename from src/android/Fridge/default.properties rename to src/ui/android/default.properties diff --git a/src/android/Fridge/res/drawable/brushed_metal.png b/src/ui/android/res/drawable/brushed_metal.png similarity index 100% rename from src/android/Fridge/res/drawable/brushed_metal.png rename to src/ui/android/res/drawable/brushed_metal.png diff --git a/src/android/Fridge/res/drawable/icon.png b/src/ui/android/res/drawable/icon.png similarity index 100% rename from src/android/Fridge/res/drawable/icon.png rename to src/ui/android/res/drawable/icon.png diff --git a/src/android/Fridge/res/layout/main.xml b/src/ui/android/res/layout/main.xml similarity index 100% rename from src/android/Fridge/res/layout/main.xml rename to src/ui/android/res/layout/main.xml diff --git a/src/android/Fridge/res/values/strings.xml b/src/ui/android/res/values/strings.xml similarity index 100% rename from src/android/Fridge/res/values/strings.xml rename to src/ui/android/res/values/strings.xml diff --git a/src/android/Fridge/src/org/grammaticalframework/fridge/FridgeMagnets.java b/src/ui/android/src/org/grammaticalframework/fridge/FridgeMagnets.java similarity index 100% rename from src/android/Fridge/src/org/grammaticalframework/fridge/FridgeMagnets.java rename to src/ui/android/src/org/grammaticalframework/fridge/FridgeMagnets.java diff --git a/src/android/Fridge/src/se/fnord/android/layout/PredicateLayout.java b/src/ui/android/src/se/fnord/android/layout/PredicateLayout.java similarity index 100% rename from src/android/Fridge/src/se/fnord/android/layout/PredicateLayout.java rename to src/ui/android/src/se/fnord/android/layout/PredicateLayout.java diff --git a/src/server/gwt/.classpath b/src/ui/gwt/.classpath similarity index 100% rename from src/server/gwt/.classpath rename to src/ui/gwt/.classpath diff --git a/src/server/gwt/.project b/src/ui/gwt/.project similarity index 100% rename from src/server/gwt/.project rename to src/ui/gwt/.project diff --git a/src/server/gwt/Editor-compile b/src/ui/gwt/Editor-compile similarity index 100% rename from src/server/gwt/Editor-compile rename to src/ui/gwt/Editor-compile diff --git a/src/server/gwt/Fridge-compile b/src/ui/gwt/Fridge-compile similarity index 100% rename from src/server/gwt/Fridge-compile rename to src/ui/gwt/Fridge-compile diff --git a/src/server/gwt/Fridge-compile-fast b/src/ui/gwt/Fridge-compile-fast similarity index 100% rename from src/server/gwt/Fridge-compile-fast rename to src/ui/gwt/Fridge-compile-fast diff --git a/src/server/gwt/Fridge-compile.bat b/src/ui/gwt/Fridge-compile.bat similarity index 100% rename from src/server/gwt/Fridge-compile.bat rename to src/ui/gwt/Fridge-compile.bat diff --git a/src/server/gwt/Fridge-shell-external b/src/ui/gwt/Fridge-shell-external similarity index 100% rename from src/server/gwt/Fridge-shell-external rename to src/ui/gwt/Fridge-shell-external diff --git a/src/server/gwt/FridgeApp.launch b/src/ui/gwt/FridgeApp.launch similarity index 100% rename from src/server/gwt/FridgeApp.launch rename to src/ui/gwt/FridgeApp.launch diff --git a/src/server/gwt/Morpho-compile b/src/ui/gwt/Morpho-compile similarity index 100% rename from src/server/gwt/Morpho-compile rename to src/ui/gwt/Morpho-compile diff --git a/src/server/gwt/Translate-compile b/src/ui/gwt/Translate-compile similarity index 100% rename from src/server/gwt/Translate-compile rename to src/ui/gwt/Translate-compile diff --git a/src/server/gwt/Translate-compile.bat b/src/ui/gwt/Translate-compile.bat similarity index 100% rename from src/server/gwt/Translate-compile.bat rename to src/ui/gwt/Translate-compile.bat diff --git a/src/server/gwt/Translate-shell-external b/src/ui/gwt/Translate-shell-external similarity index 100% rename from src/server/gwt/Translate-shell-external rename to src/ui/gwt/Translate-shell-external diff --git a/src/server/gwt/TranslateApp.launch b/src/ui/gwt/TranslateApp.launch similarity index 100% rename from src/server/gwt/TranslateApp.launch rename to src/ui/gwt/TranslateApp.launch diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp.gwt.xml similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp.gwt.xml rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp.gwt.xml diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/PGF.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/PGF.gwt.xml similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/PGF.gwt.xml rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/PGF.gwt.xml diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/TranslateApp.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/TranslateApp.gwt.xml similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/TranslateApp.gwt.xml rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/TranslateApp.gwt.xml diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/AbstractSyntaxController.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/AbstractSyntaxController.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/AbstractSyntaxController.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/AbstractSyntaxController.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/BrowsePanel.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/BrowsePanel.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/BrowsePanel.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/BrowsePanel.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/CompletionOracle.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/CompletionOracle.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/CompletionOracle.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/CompletionOracle.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/EditorApp.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/EditorApp.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/EditorApp.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/EditorApp.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeApp.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeApp.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeApp.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeApp.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeBagPanel.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeBagPanel.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeBagPanel.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeBagPanel.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/IterableJsArray.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/IterableJsArray.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/IterableJsArray.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/IterableJsArray.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/JSONCallback.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/JSONCallback.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/JSONCallback.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/JSONCallback.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequest.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequest.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequest.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequest.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequestBuilder.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequestBuilder.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequestBuilder.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/JSONRequestBuilder.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/Magnet.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/Magnet.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/Magnet.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/Magnet.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/MagnetFactory.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/MagnetFactory.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/MagnetFactory.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/MagnetFactory.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/MorphoApp.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/MorphoApp.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/MorphoApp.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/MorphoApp.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/MyListBox.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/MyListBox.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/MyListBox.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/MyListBox.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGF.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/PGFWrapper.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SettingsPanel.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/StatusPopup.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/StatusPopup.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/StatusPopup.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/StatusPopup.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/SubList.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SubList.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/SubList.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SubList.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/SuggestPanel.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SuggestPanel.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/SuggestPanel.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/SuggestPanel.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/public/Editor.css b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/Editor.css similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/public/Editor.css rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/Editor.css diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/public/Fridge.css b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/Fridge.css similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/public/Fridge.css rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/Fridge.css diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/public/Translate.css b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/Translate.css similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/public/Translate.css rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/Translate.css diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/public/align-btn.png b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/align-btn.png similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/public/align-btn.png rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/align-btn.png diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/public/brushed-metal.png b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/brushed-metal.png similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/public/brushed-metal.png rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/brushed-metal.png diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/public/delete-last.png b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/delete-last.png similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/public/delete-last.png rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/delete-last.png diff --git a/src/server/gwt/src/org/grammaticalframework/ui/gwt/public/tree-btn.png b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/tree-btn.png similarity index 100% rename from src/server/gwt/src/org/grammaticalframework/ui/gwt/public/tree-btn.png rename to src/ui/gwt/src/org/grammaticalframework/ui/gwt/public/tree-btn.png diff --git a/src/server/gwt/www/editor/index.html b/src/ui/gwt/www/editor/index.html similarity index 100% rename from src/server/gwt/www/editor/index.html rename to src/ui/gwt/www/editor/index.html diff --git a/src/server/gwt/www/fridge/index.html b/src/ui/gwt/www/fridge/index.html similarity index 100% rename from src/server/gwt/www/fridge/index.html rename to src/ui/gwt/www/fridge/index.html diff --git a/src/server/gwt/www/morpho/index.html b/src/ui/gwt/www/morpho/index.html similarity index 100% rename from src/server/gwt/www/morpho/index.html rename to src/ui/gwt/www/morpho/index.html diff --git a/src/server/gwt/www/morpho/morpho.fcgi b/src/ui/gwt/www/morpho/morpho.fcgi similarity index 100% rename from src/server/gwt/www/morpho/morpho.fcgi rename to src/ui/gwt/www/morpho/morpho.fcgi diff --git a/src/server/gwt/www/translate/index.html b/src/ui/gwt/www/translate/index.html similarity index 100% rename from src/server/gwt/www/translate/index.html rename to src/ui/gwt/www/translate/index.html