diff --git a/src/server/gwt/.classpath b/src/server/gwt/.classpath index 88918ea5b..781d7a2f8 100644 --- a/src/server/gwt/.classpath +++ b/src/server/gwt/.classpath @@ -1,8 +1,7 @@ - - - - - - - - + + + + + + + diff --git a/src/server/gwt/.project b/src/server/gwt/.project index dc1b7042a..dfd6dab3f 100644 --- a/src/server/gwt/.project +++ b/src/server/gwt/.project @@ -1,15 +1,28 @@ - - - GF-GWT - GF-GWT project - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.jdt.core.javanature - - + + + GF-GWT + GF-GWT project + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.google.gdt.eclipse.core.webAppProjectValidator + + + + + com.google.gwt.eclipse.core.gwtProjectValidator + + + + + + org.eclipse.jdt.core.javanature + com.google.gwt.eclipse.core.gwtNature + + diff --git a/src/server/gwt/lib/gwt-dnd-2.5.6.jar b/src/server/gwt/lib/gwt-dnd-2.5.6.jar deleted file mode 100644 index fcb838b75..000000000 Binary files a/src/server/gwt/lib/gwt-dnd-2.5.6.jar and /dev/null differ diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml b/src/server/gwt/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml index d4498164b..549a16f0d 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/PGF.gwt.xml @@ -4,8 +4,6 @@ - - - - + + diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java index fbb6a7bb4..602a6b8d0 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/AbstractSyntaxController.java @@ -2,8 +2,6 @@ package se.chalmers.cs.gf.gwt.client; import java.util.*; -import com.google.gwt.core.client.*; -import com.google.gwt.user.client.*; import com.google.gwt.user.client.ui.*; diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/BrowsePanel.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/BrowsePanel.java index f9a159e58..a0c247dea 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/BrowsePanel.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/BrowsePanel.java @@ -1,11 +1,8 @@ package se.chalmers.cs.gf.gwt.client; import java.util.*; -import java.lang.*; -import com.google.gwt.core.client.*; import com.google.gwt.user.client.ui.*; import com.google.gwt.http.client.*; -import com.google.gwt.dom.client.*; public class BrowsePanel extends Composite { diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/EditorApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/EditorApp.java index f9cd1422e..76cd9305e 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/EditorApp.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/EditorApp.java @@ -1,7 +1,5 @@ package se.chalmers.cs.gf.gwt.client; -import java.util.*; - import com.google.gwt.core.client.*; import com.google.gwt.user.client.*; import com.google.gwt.user.client.ui.*; diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java index 6a0eb9ba1..571233838 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeApp.java @@ -2,8 +2,6 @@ package se.chalmers.cs.gf.gwt.client; import java.util.List; -import com.allen_sauer.gwt.dnd.client.PickupDragController; -import com.allen_sauer.gwt.dnd.client.drop.DropController; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.user.client.*; import com.google.gwt.user.client.ui.*; @@ -124,28 +122,13 @@ public class FridgeApp implements EntryPoint { // GUI protected Widget createUI() { - PickupDragController dragController = new PickupDragController(RootPanel.get(), false); - dragController.setBehaviorDragStartSensitivity(1); - dragController.setBehaviorDragProxy(true); - dragController.setBehaviorConstrainedToBoundaryPanel(true); - /* - dragController.addDragHandler(new DragHandlerAdapter() { - public void onDragStart(DragStartEvent event) { - Widget w = event.getContext().draggable; - if (w instanceof Magnet) { - bagPanel.cloneMagnet((Magnet)w); - } - } - }); - */ - ClickListener magnetClickListener = new ClickListener () { public void onClick(Widget widget) { Magnet magnet = (Magnet)widget; textPanel.addMagnet(magnet); } }; - magnetFactory = new MagnetFactory(dragController, magnetClickListener); + magnetFactory = new MagnetFactory(magnetClickListener); textPanel = new FridgeTextPanel(magnetFactory); textPanel.addChangeListener(new ChangeListener() { @@ -172,9 +155,6 @@ public class FridgeApp implements EntryPoint { mainPanel.setCellHorizontalAlignment(outputPanel, HasHorizontalAlignment.ALIGN_RIGHT); mainPanel.setCellWidth(settingsPanel, "100%"); - DropController dropController = new FridgeTextPanelDropController(textPanel); - dragController.registerDropController(dropController); - Window.addWindowResizeListener(new WindowResizeListener() { public void onWindowResized(int w, int h) { mainPanel.setPixelSize(w, h); diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeBagPanel.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeBagPanel.java index b123d2334..ed88a70ce 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeBagPanel.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeBagPanel.java @@ -3,13 +3,7 @@ package se.chalmers.cs.gf.gwt.client; import java.util.LinkedHashSet; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.ScrollPanel; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.*; public class FridgeBagPanel extends Composite { diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeTextPanel.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeTextPanel.java index 9fcc27209..e2bf0b21c 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeTextPanel.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeTextPanel.java @@ -1,16 +1,6 @@ package se.chalmers.cs.gf.gwt.client; -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.ChangeListenerCollection; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.DockPanel; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Panel; -import com.google.gwt.user.client.ui.PushButton; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.*; public class FridgeTextPanel extends Composite { diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeTextPanelDropController.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeTextPanelDropController.java deleted file mode 100644 index 76e5706d5..000000000 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/FridgeTextPanelDropController.java +++ /dev/null @@ -1,34 +0,0 @@ -package se.chalmers.cs.gf.gwt.client; - -import com.allen_sauer.gwt.dnd.client.DragContext; -import com.allen_sauer.gwt.dnd.client.drop.SimpleDropController; -import com.google.gwt.user.client.ui.Widget; - -public class FridgeTextPanelDropController extends SimpleDropController { - - private FridgeTextPanel textPanel; - - public FridgeTextPanelDropController (FridgeTextPanel textPanel) { - super(textPanel); - this.textPanel = textPanel; - } - - public void onEnter(DragContext context) { - super.onEnter(context); - textPanel.setEngaged(true); - } - - public void onLeave(DragContext context) { - textPanel.setEngaged(false); - super.onLeave(context); - } - - public void onDrop(DragContext context) { - for (Widget widget : context.selectedWidgets) { - Magnet magnet = (Magnet)widget; - textPanel.addMagnet(magnet); - } - super.onDrop(context); - } - -} diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/MagnetFactory.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/MagnetFactory.java index 4199eea18..57af52068 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/MagnetFactory.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/MagnetFactory.java @@ -1,16 +1,12 @@ package se.chalmers.cs.gf.gwt.client; -import com.allen_sauer.gwt.dnd.client.PickupDragController; -import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.*; public class MagnetFactory { - private PickupDragController dragController; - private ClickListener clickListener; - public MagnetFactory (PickupDragController dragController, ClickListener clickListener) { - this.dragController = dragController; + public MagnetFactory (ClickListener clickListener) { this.clickListener = clickListener; } @@ -29,7 +25,6 @@ public class MagnetFactory { public Magnet createMagnet(String text, String language) { Magnet magnet = new Magnet(text, language); magnet.addClickListener(clickListener); - dragController.makeDraggable(magnet); return magnet; } diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java index f0729e0d7..1c69e58be 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/PGFWrapper.java @@ -60,7 +60,7 @@ public class PGFWrapper { RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, URL.encode(url)); try { - Request request = builder.sendRequest(null, new RequestCallback() { + builder.sendRequest(null, new RequestCallback() { public void onResponseReceived(Request request, Response response) { if (200 == response.getStatusCode()) diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SettingsPanel.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SettingsPanel.java index eb5155261..af3e6459e 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SettingsPanel.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SettingsPanel.java @@ -1,10 +1,6 @@ package se.chalmers.cs.gf.gwt.client; -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.*; public class SettingsPanel extends Composite { diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SuggestPanel.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SuggestPanel.java index fea44c820..6a134b522 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SuggestPanel.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/SuggestPanel.java @@ -4,15 +4,7 @@ import java.util.LinkedList; import java.util.List; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.DockPanel; -import com.google.gwt.user.client.ui.HasText; -import com.google.gwt.user.client.ui.HasVerticalAlignment; -import com.google.gwt.user.client.ui.KeyboardListenerAdapter; -import com.google.gwt.user.client.ui.SuggestBox; -import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.*; public class SuggestPanel extends Composite implements HasText { diff --git a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java index b026cb83b..06d870660 100644 --- a/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java +++ b/src/server/gwt/src/se/chalmers/cs/gf/gwt/client/TranslateApp.java @@ -2,10 +2,8 @@ package se.chalmers.cs.gf.gwt.client; import java.util.List; -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.History; -import com.google.gwt.user.client.HistoryListener; +import com.google.gwt.core.client.*; +import com.google.gwt.user.client.*; import com.google.gwt.user.client.ui.*;