[gwt-html-editor] r92 committed - # Supporting GWT 2.0 and Java 1.6...
codesite...@google.com
Author: aneisen
Date: Thu Jan 21 19:45:27 2010
Log: # Supporting GWT 2.0 and Java 1.6
# The toolbar allows changing the font name
http://code.google.com/p/gwt-html-editor/source/detail?r=92
Added:
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontNameCombo.java
Modified:
/trunk/build.xml
/trunk/src/com/gc/gwt/ext/client/AlwaysVisiblePanel.java
/trunk/src/com/gc/gwt/ext/client/SplitPane.java
/trunk/src/com/gc/gwt/wysiwyg/client/Editor.java
/trunk/src/com/gc/gwt/wysiwyg/client/EditorIframe.java
/trunk/src/com/gc/gwt/wysiwyg/client/EditorPromptBox.java
/trunk/src/com/gc/gwt/wysiwyg/client/EditorToolbar.java
/trunk/src/com/gc/gwt/wysiwyg/client/EditorToolbarButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/EditorUtils.java
/trunk/src/com/gc/gwt/wysiwyg/client/EditorWYSIWYG.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultConstants.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultEditorToolbar.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultEditorToolbarWidgetsFactory.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/EditorColorPicker.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/SimpleCommandButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/SimpleOneFieldPromptBox.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/BackToRichTextButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/BackgroundColorButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontSizesCombo.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontStyleButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/ForegroundColorButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/InsertImageButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/LinkButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/ShowSourceButton.java
/trunk/src/com/gc/gwt/wysiwyg/client/impl/EditorUtilsImpl.java
/trunk/src/com/gc/gwt/wysiwyg/client/impl/EditorUtilsImplCommon.java
/trunk/test/com/gc/gwt/wysiwyg/test/client/Test.java
/trunk/test/com/gc/gwt/wysiwyg/test/public/Test.html
=======================================
--- /dev/null
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontNameCombo.java
Thu Jan 21 19:45:27 2010
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2006 Pavel Jbanov.
+ *
+ * Licensed 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.
+ */
+
+package com.gc.gwt.wysiwyg.client.defaults.widgets;
+
+import com.gc.gwt.wysiwyg.client.Editor;
+import com.gc.gwt.wysiwyg.client.EditorToolbarSelect;
+import com.gc.gwt.wysiwyg.client.EditorUtils;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.user.client.ui.ListBox;
+
+public class FontNameCombo extends EditorToolbarSelect implements
+ ChangeHandler {
+
+ Editor editor;
+
+ public FontNameCombo(Editor editor) {
+ this.editor = editor;
+ init();
+ }
+
+ public void onChange(ChangeEvent event) {
+ ListBox subj = ((ListBox) event.getSource());
+ String value = subj.getValue(subj.getSelectedIndex());
+ subj.setSelectedIndex(0);
+ EditorUtils.doFontName(editor.getEditorWYSIWYG().getFrame()
+ .getElement(), value);
+ EditorUtils.doFocus(editor.getEditorWYSIWYG().getFrame().getElement());
+ }
+
+ private void init() {
+ this.addItem("Font name", "");
+ this.addItem("Arial", "Arial");
+ this.addItem("Comic Sans MS", "Comic Sans MS");
+ this.addItem("Courier", "Courier");
+ this.addItem("Georgia", "Georgia");
+ this.addItem("Impact", "Impact");
+ this.addItem("Tahoma", "Tahoma");
+ this.addItem("Times", "Times");
+ this.addItem("Verdana", "Verdana");
+ this.addChangeHandler(this);
+ }
+}
=======================================
--- /trunk/build.xml Tue Apr 3 12:19:44 2007
+++ /trunk/build.xml Thu Jan 21 19:45:27 2010
@@ -20,8 +20,8 @@
</target>
<target name="gwt-test-compile">
- <java classpathref="gwt.compile.class.path"
classname="com.google.gwt.dev.GWTCompiler" fork="true" >
- <arg value="-out"/>
+ <java classpathref="gwt.compile.class.path"
classname="com.google.gwt.dev.Compiler" fork="true" >
+ <arg value="-war"/>
<arg value="${gwt.output}"/>
<arg value="com.gc.gwt.wysiwyg.test.Test"/>
</java>
@@ -40,7 +40,7 @@
<target name="compile">
<mkdir dir="${build.dir}"/>
<mkdir dir="${classes.dir}"/>
- <javac destdir="${classes.dir}" debug= "on" failonerror="true"
nowarn="on" memoryMaximumSize="128m" fork="true" source="1.4" target="1.4">
+ <javac destdir="${classes.dir}" debug= "on" failonerror="true"
nowarn="on" memoryMaximumSize="128m" fork="true" source="1.6" target="1.6">
<classpath refid="gwt.compile.class.path"/>
<src path="${source.dir}"/>
<exclude name="**/.svn/**"/>
=======================================
--- /trunk/src/com/gc/gwt/ext/client/AlwaysVisiblePanel.java Tue Apr 3
12:19:44 2007
+++ /trunk/src/com/gc/gwt/ext/client/AlwaysVisiblePanel.java Thu Jan 21
19:45:27 2010
@@ -16,11 +16,12 @@
package com.gc.gwt.ext.client;
+import com.google.gwt.dom.client.NativeEvent;
+import com.google.gwt.event.logical.shared.ResizeEvent;
+import com.google.gwt.event.logical.shared.ResizeHandler;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
-import com.google.gwt.user.client.EventPreview;
import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.WindowResizeListener;
import com.google.gwt.user.client.ui.SimplePanel;
/**
@@ -48,12 +49,12 @@
* awp = new AlwaysVisiblePanel();
*/
public AlwaysVisiblePanel() {
- DOM.addEventPreview(new EventPreview() {
- public boolean onEventPreview(Event event) {
- if (DOM.eventGetType(event) == Event.ONSCROLL) {
+ Event.addNativePreviewHandler(new Event.NativePreviewHandler() {
+ public void onPreviewNativeEvent(Event.NativePreviewEvent event) {
+ NativeEvent e = event.getNativeEvent();
+ if (Event.getTypeInt(e.getType()) == Event.ONSCROLL) {
adjustPosition();
}
- return true;
}
});
}
@@ -73,8 +74,8 @@
adjustPosition();
- Window.addWindowResizeListener(new WindowResizeListener() {
- public void onWindowResized(int width, int height) {
+ Window.addResizeHandler(new ResizeHandler() {
+ public void onResize(ResizeEvent event) {
adjustPosition();
}
});
=======================================
--- /trunk/src/com/gc/gwt/ext/client/SplitPane.java Tue Apr 3 12:27:35 2007
+++ /trunk/src/com/gc/gwt/ext/client/SplitPane.java Thu Jan 21 19:45:27 2010
@@ -17,6 +17,12 @@
package com.gc.gwt.ext.client;
import com.gc.gwt.wysiwyg.client.EditorUtils;
+import com.google.gwt.event.dom.client.MouseDownEvent;
+import com.google.gwt.event.dom.client.MouseDownHandler;
+import com.google.gwt.event.dom.client.MouseMoveEvent;
+import com.google.gwt.event.dom.client.MouseMoveHandler;
+import com.google.gwt.event.dom.client.MouseUpEvent;
+import com.google.gwt.event.dom.client.MouseUpHandler;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.Window;
@@ -24,7 +30,6 @@
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HasAlignment;
import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.MouseListener;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
@@ -147,7 +152,7 @@
this.originalHeight = this.getOffsetHeight();
}
- private class Divider extends Image implements MouseListener {
+ private class Divider extends Image implements MouseDownHandler,
MouseUpHandler, MouseMoveHandler {
private boolean dragging = false;
@@ -160,7 +165,9 @@
setStyleName("SplitPaneDivider-Vertical");
}
- addMouseListener(this);
+ addMouseDownHandler(this);
+ addMouseUpHandler(this);
+ addMouseMoveHandler(this);
}
protected void onLoad() {
@@ -204,29 +211,23 @@
}
}
- public void onMouseDown(Widget sender, int x, int y) {
+ public void onMouseDown(MouseDownEvent event) {
dragging = true;
DOM.setCapture(this.getElement());
}
- public void onMouseUp(Widget sender, int x, int y) {
+ public void onMouseUp(MouseUpEvent event) {
dragging = false;
DOM.releaseCapture(this.getElement());
}
- public void onMouseEnter(Widget sender) {
- }
-
- public void onMouseLeave(Widget sender) {
- }
-
- public void onMouseMove(Widget sender, int x, int y) {
+ public void onMouseMove(MouseMoveEvent event) {
if (dragging) {
CellFormatter cellFormatter = mainContainer.getCellFormatter();
int newFirstWidth;
if (splitOrientation == VERTICAL_SPLIT) {
- newFirstWidth =
EditorUtils.parseInt(DOM.getStyleAttribute(cellFormatter.getElement(0,
0), "width")) + x;
+ newFirstWidth =
EditorUtils.parseInt(DOM.getStyleAttribute(cellFormatter.getElement(0,
0), "width")) + event.getX();
if (newFirstWidth >= originalWidth) {
newFirstWidth = originalWidth;
@@ -237,7 +238,7 @@
- divider.getOffsetWidth())
+ "px");
} else {
- newFirstWidth =
EditorUtils.parseInt(DOM.getStyleAttribute(cellFormatter.getElement(0,
0), "height")) + y;
+ newFirstWidth =
EditorUtils.parseInt(DOM.getStyleAttribute(cellFormatter.getElement(0,
0), "height")) + event.getY();
if (newFirstWidth >= originalHeight) {
newFirstWidth = originalHeight;
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/Editor.java Tue Apr 3 12:19:44
2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/Editor.java Thu Jan 21 19:45:27
2010
@@ -20,20 +20,21 @@
import java.util.List;
import com.gc.gwt.wysiwyg.client.defaults.DefaultEditorToolbar;
+import com.google.gwt.event.dom.client.HasLoadHandlers;
+import com.google.gwt.event.dom.client.LoadEvent;
+import com.google.gwt.event.dom.client.LoadHandler;
+import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.LoadListener;
-import com.google.gwt.user.client.ui.SourcesLoadEvents;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
/**
* Rich Text Editor Widget.
*
* @author pavel.jbanov
*/
-public class Editor extends Composite implements SourcesLoadEvents {
+public class Editor extends Composite implements HasLoadHandlers {
private EditorToolbar toolbar;
@@ -45,7 +46,7 @@
private boolean initialized = false;
// listeners
- private List loadListeners = new ArrayList();
+ private List<LoadHandler> loadListeners = new ArrayList<LoadHandler>();
public Editor() {
this(null);
@@ -66,8 +67,8 @@
wysiwyg = new EditorWYSIWYG(this);
wysiwyg.setWidth("100%");
- addLoadListener(new LoadListener() {
- public void onLoad(Widget sender) {
+ addLoadHandler(new LoadHandler() {
+ public void onLoad(LoadEvent sender) {
initialized = true;
if (tmpHTMLStorage != null) {
@@ -75,10 +76,6 @@
tmpHTMLStorage = null;
}
}
-
- public void onError(Widget sender) {
- // TODO Implement error handling
- }
});
container = new VerticalPanel();
@@ -168,17 +165,9 @@
*
* @param listener Load Listener to attach
*/
- public void addLoadListener(LoadListener listener) {
+ public HandlerRegistration addLoadHandler(LoadHandler listener) {
loadListeners.add(listener);
- }
-
- /**
- * Remove load listener.
- *
- * @parame listener Load Listener to remove
- */
- public void removeLoadListener(LoadListener listener) {
- loadListeners.remove(listener);
+ return null;
}
/**
@@ -186,7 +175,7 @@
*/
private void notifyLoadListeners() {
for (int i = 0; i < loadListeners.size(); i++) {
- ((LoadListener) loadListeners.get(i)).onLoad(this);
+ loadListeners.get(i).onLoad(null);
}
}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/EditorIframe.java Thu Jan 25
08:23:56 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/EditorIframe.java Thu Jan 21
19:45:27 2010
@@ -17,7 +17,6 @@
package com.gc.gwt.wysiwyg.client;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import com.google.gwt.user.client.DOM;
@@ -32,7 +31,7 @@
sinkEvents(Event.MOUSEEVENTS);
}
- private List mouseOverListeners = new ArrayList();
+ private List<EditorMouseOverListener> mouseOverListeners = new
ArrayList<EditorMouseOverListener>();
public void addMouseOverListener(EditorMouseOverListener listener) {
mouseOverListeners.add(listener);
@@ -44,8 +43,8 @@
public void onBrowserEvent(Event event) {
if (DOM.eventGetType(event) == Event.ONMOUSEOVER) {
- for (Iterator i = mouseOverListeners.iterator(); i.hasNext();) {
- ((EditorMouseOverListener) i.next()).onMouseOver(this);
+ for (EditorMouseOverListener listener : mouseOverListeners) {
+ listener.onMouseOver(this);
}
}
}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/EditorPromptBox.java Thu Jan 25
08:36:12 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/EditorPromptBox.java Thu Jan 21
19:45:27 2010
@@ -17,7 +17,6 @@
package com.gc.gwt.wysiwyg.client;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import com.google.gwt.user.client.ui.DialogBox;
@@ -85,7 +84,7 @@
fireSubmitEvent(value);
}
- private List submitListeners = new ArrayList();
+ private List<EditorPromptBoxSubmitListener> submitListeners = new
ArrayList<EditorPromptBoxSubmitListener>();
/**
* TODO: javadocs.
@@ -111,8 +110,8 @@
* @param value
*/
private void fireSubmitEvent(String value) {
- for (Iterator iter = submitListeners.iterator(); iter.hasNext();) {
- ((EditorPromptBoxSubmitListener) iter.next()).onSubmit(value);
+ for (EditorPromptBoxSubmitListener listener : submitListeners) {
+ listener.onSubmit(value);
}
}
}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/EditorToolbar.java Mon Feb 5
08:26:31 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/EditorToolbar.java Thu Jan 21
19:45:27 2010
@@ -33,7 +33,7 @@
private static class EditorToolbarFlowPanel extends FlowPanel {
public void insert(Widget w, int beforeIndex) {
- super.insert(w, null, beforeIndex);
+ super.insert(w, beforeIndex);
DOM.insertChild(getElement(), w.getElement(), beforeIndex);
}
}
@@ -41,8 +41,8 @@
/* Fields */
private final EditorToolbarFlowPanel fullToolbar;
- private final Map widgetMap = new HashMap();
- private final Map widgetIDMap = new HashMap();
+ private final Map<String, Widget> widgetMap = new HashMap<String,
Widget>();
+ private final Map<Widget, String> widgetIDMap = new HashMap<Widget,
String>();
private final FlowPanel sourceToolbar;
private final CellPanel topContainer;
private int spacerCounter = 0;
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/EditorToolbarButton.java Thu Feb
1 12:38:11 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/EditorToolbarButton.java Thu Jan
21 19:45:27 2010
@@ -16,11 +16,13 @@
package com.gc.gwt.wysiwyg.client;
+import com.google.gwt.event.dom.client.MouseOutEvent;
+import com.google.gwt.event.dom.client.MouseOutHandler;
+import com.google.gwt.event.dom.client.MouseOverEvent;
+import com.google.gwt.event.dom.client.MouseOverHandler;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.MouseListener;
-import com.google.gwt.user.client.ui.Widget;
public class EditorToolbarButton extends Image {
@@ -34,7 +36,9 @@
this.setTitle(buttonId);
this.buttonId = buttonId;
- this.addMouseListener(new OnMouseOverDecorateButtonListener(this));
+ OnMouseOverDecorateButtonListener listener = new
OnMouseOverDecorateButtonListener(this);
+ this.addMouseOverHandler(listener);
+ this.addMouseOutHandler(listener);
this.setStyleName("Editor-Toolbar-Button Editor-Toolbar-Button-" +
buttonId);
}
@@ -46,7 +50,7 @@
this.buttonId = buttonId;
}
- private class OnMouseOverDecorateButtonListener implements MouseListener
{
+ private class OnMouseOverDecorateButtonListener implements
MouseOverHandler, MouseOutHandler {
private EditorToolbarButton button;
@@ -54,24 +58,14 @@
this.button = button;
}
- public void onMouseEnter(Widget sender) {
+ public void onMouseOver(MouseOverEvent event) {
button.setStyleName("Editor-Toolbar-Button
Editor-Toolbar-Button-hover Editor-Toolbar-Button-"
+ button.getButtonId());
}
- public void onMouseLeave(Widget sender) {
+ public void onMouseOut(MouseOutEvent event) {
button.setStyleName("Editor-Toolbar-Button Editor-Toolbar-Button-" +
button.getButtonId());
}
-
- public void onMouseDown(Widget sender, int x, int y) {
- }
-
- public void onMouseMove(Widget sender, int x, int y) {
- }
-
- public void onMouseUp(Widget sender, int x, int y) {
- }
-
}
/**
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/EditorUtils.java Tue Apr 3
12:19:44 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/EditorUtils.java Thu Jan 21
19:45:27 2010
@@ -128,6 +128,10 @@
public static void doFontSize(Element oIframe, String size) {
impl.doFontSize(oIframe, size);
}
+
+ public static void doFontName(Element oIframe, String size) {
+ impl.doFontName(oIframe, size);
+ }
public static void enableDesignMode(Element oIframe, EditorLoadListener
loadListener) {
impl.enableDesignMode(oIframe, loadListener);
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/EditorWYSIWYG.java Tue Apr 3
12:19:44 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/EditorWYSIWYG.java Thu Jan 21
19:45:27 2010
@@ -17,7 +17,6 @@
package com.gc.gwt.wysiwyg.client;
import com.google.gwt.user.client.Element;
-import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.VerticalPanel;
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultConstants.java Sun
Feb 4 21:04:02 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultConstants.java Thu
Jan 21 19:45:27 2010
@@ -156,4 +156,6 @@
public static final String BUTTON_FONT_STYLE = "ButtonFontStyle";
public static final String BUTTON_FONT_SIZE = "ButtonFontSize";
-}
+
+ public static final String BUTTON_FONT_NAME = "ButtonFontName";
+}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultEditorToolbar.java
Tue Apr 3 12:27:35 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultEditorToolbar.java
Thu Jan 21 19:45:27 2010
@@ -82,6 +82,7 @@
this.putWidgetLast(toolbarWidgetsFactory.getFontStyleWidget(),
DefaultConstants.BUTTON_FONT_STYLE);
this.putWidgetLast(toolbarWidgetsFactory.getFontSizeWidget(),
DefaultConstants.BUTTON_FONT_SIZE);
+ this.putWidgetLast(toolbarWidgetsFactory.getFontNameWidget(),
DefaultConstants.BUTTON_FONT_NAME);
this.addSourceToolbarWidget(toolbarWidgetsFactory.getBackToRichTextWidget());
}
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultEditorToolbarWidgetsFactory.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/DefaultEditorToolbarWidgetsFactory.java
Thu Jan 21 19:45:27 2010
@@ -180,4 +180,8 @@
public Widget getBackToRichTextWidget() {
return new BackToRichTextButton(editor);
}
-}
+
+ public Widget getFontNameWidget() {
+ return new FontNameCombo(editor);
+ }
+}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/defaults/EditorColorPicker.java
Sun Feb 4 15:26:19 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/defaults/EditorColorPicker.java
Thu Jan 21 19:45:27 2010
@@ -17,19 +17,17 @@
package com.gc.gwt.wysiwyg.client.defaults;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasAlignment;
-import com.google.gwt.user.client.ui.SourcesTableEvents;
-import com.google.gwt.user.client.ui.TableListener;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.HTMLTable.Cell;
public class EditorColorPicker extends DialogBox {
// 18x12
@@ -54,7 +52,7 @@
"66FF66", "66FF99", "66FFCC", "66FFFF", "99FF00", "99FF33", "99FF66", "99FF99", "99FFCC", "99FFFF", "CCFF00",
"CCFF33", "CCFF66", "CCFF99", "CCFFCC", "CCFFFF", "FFFF00", "FFFF33", "FFFF66", "FFFF99", "FFFFCC", "FFFFFF"
};
- private List selectListeners = new ArrayList();
+ private List<EditorColorSelectListener> selectListeners = new
ArrayList<EditorColorSelectListener>();
public EditorColorPicker(String title) {
this.setStyleName("Editor-DialogBox");
@@ -62,7 +60,7 @@
VerticalPanel vp = new VerticalPanel();
- Grid grid = new Grid(12, 18);
+ final Grid grid = new Grid(12, 18);
grid.setCellPadding(0);
grid.setCellSpacing(1);
@@ -73,9 +71,10 @@
}
}
- grid.addTableListener(new TableListener() {
- public void onCellClicked(SourcesTableEvents sender, int row, int
cell) {
- fireColorSelected(colors[row * 12 + cell]);
+ grid.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
+ Cell cell = grid.getCellForEvent(event);
+ fireColorSelected(colors[cell.getRowIndex() * 12 +
cell.getCellIndex()]);
hide();
}
});
@@ -84,8 +83,8 @@
vp.add(grid);
Button cancelButton = new Button("Cancel");
- cancelButton.addClickListener(new ClickListener() {
- public void onClick(Widget sender) {
+ cancelButton.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
hide();
}
});
@@ -105,8 +104,8 @@
}
private void fireColorSelected(String rgb) {
- for (Iterator i = selectListeners.iterator(); i.hasNext();) {
- ((EditorColorSelectListener) i.next()).colorSelected(rgb);
+ for (EditorColorSelectListener listener : selectListeners) {
+ listener.colorSelected(rgb);
}
}
}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/defaults/SimpleCommandButton.java
Tue Apr 3 12:19:44 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/defaults/SimpleCommandButton.java
Thu Jan 21 19:45:27 2010
@@ -17,8 +17,8 @@
package com.gc.gwt.wysiwyg.client.defaults;
import com.gc.gwt.wysiwyg.client.EditorToolbarButton;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
public class SimpleCommandButton extends EditorToolbarButton {
@@ -29,8 +29,8 @@
public SimpleCommandButton(String buttonId, final EditorCommand command,
final boolean ui, String value) {
super(buttonId);
- this.addClickListener(new ClickListener() {
- public void onClick(Widget sender) {
+ this.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
command.exec(null);
}
});
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/SimpleOneFieldPromptBox.java
Tue Apr 3 12:19:44 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/SimpleOneFieldPromptBox.java
Thu Jan 21 19:45:27 2010
@@ -17,8 +17,9 @@
package com.gc.gwt.wysiwyg.client.defaults;
import com.gc.gwt.wysiwyg.client.Editor;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.HasAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
@@ -60,15 +61,15 @@
HorizontalPanel hzButtons = new HorizontalPanel();
Button b = new Button(buttonLabel);
- b.addClickListener(new ClickListener() {
- public void onClick(Widget sender) {
+ b.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
submit(urlTextBox.getText());
}
});
Button c = new Button("Cancel");
- c.addClickListener(new ClickListener() {
- public void onClick(Widget sender) {
+ c.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
submit(null);
}
});
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/BackToRichTextButton.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/BackToRichTextButton.java
Thu Jan 21 19:45:27 2010
@@ -19,20 +19,20 @@
import com.gc.gwt.wysiwyg.client.Editor;
import com.gc.gwt.wysiwyg.client.EditorToolbarButton;
import com.gc.gwt.wysiwyg.client.defaults.DefaultConstants;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
-
-public class BackToRichTextButton extends EditorToolbarButton implements
ClickListener {
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+
+public class BackToRichTextButton extends EditorToolbarButton implements
ClickHandler {
Editor editor;
public BackToRichTextButton(Editor editor) {
super(DefaultConstants.BUTTON_BACK_TO_FULL_TOOLBAR);
this.editor = editor;
- this.addClickListener(this);
+ this.addClickHandler(this);
}
- public void onClick(Widget sender) {
+ public void onClick(ClickEvent event) {
editor.getEditorWYSIWYG().toggleView();
}
}
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/BackgroundColorButton.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/BackgroundColorButton.java
Thu Jan 21 19:45:27 2010
@@ -22,12 +22,12 @@
import com.gc.gwt.wysiwyg.client.defaults.DefaultConstants;
import com.gc.gwt.wysiwyg.client.defaults.EditorColorPicker;
import com.gc.gwt.wysiwyg.client.defaults.EditorColorSelectListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
public class BackgroundColorButton
extends EditorToolbarButton
- implements EditorColorSelectListener, ClickListener {
+ implements EditorColorSelectListener, ClickHandler {
private Editor editor;
private EditorColorPicker bgPicker;
@@ -44,7 +44,7 @@
EditorUtils.doFocus(editor.getEditorWYSIWYG().getFrame().getElement());
}
- public void onClick(Widget sender) {
+ public void onClick(ClickEvent event) {
EditorUtils.saveSelection(editor.getEditorWYSIWYG().getFrame().getElement());
bgPicker.show();
bgPicker.setPopupPosition(editor.getAbsoluteLeft() + 50,
editor.getAbsoluteTop() + 50);
@@ -53,6 +53,6 @@
private void init() {
this.bgPicker = new EditorColorPicker("Select Background Color");
this.bgPicker.addSelectListener(this);
- this.addClickListener(this);
+ this.addClickHandler(this);
}
}
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontSizesCombo.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontSizesCombo.java
Thu Jan 21 19:45:27 2010
@@ -19,11 +19,11 @@
import com.gc.gwt.wysiwyg.client.Editor;
import com.gc.gwt.wysiwyg.client.EditorToolbarSelect;
import com.gc.gwt.wysiwyg.client.EditorUtils;
-import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.Widget;
-
-public class FontSizesCombo extends EditorToolbarSelect implements
ChangeListener {
+
+public class FontSizesCombo extends EditorToolbarSelect implements
ChangeHandler {
Editor editor;
@@ -32,8 +32,8 @@
init();
}
- public void onChange(Widget sender) {
- ListBox subj = ((ListBox) sender);
+ public void onChange(ChangeEvent event) {
+ ListBox subj = ((ListBox) event.getSource());
String value = subj.getValue(subj.getSelectedIndex());
subj.setSelectedIndex(0);
EditorUtils.doFontSize(editor.getEditorWYSIWYG().getFrame().getElement(),
value);
@@ -45,6 +45,6 @@
for (int i = 1; i < 8; i++) {
this.addItem("Size " + i, "" + i);
}
- this.addChangeListener(this);
+ this.addChangeHandler(this);
}
}
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontStyleButton.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/FontStyleButton.java
Thu Jan 21 19:45:27 2010
@@ -19,11 +19,11 @@
import com.gc.gwt.wysiwyg.client.Editor;
import com.gc.gwt.wysiwyg.client.EditorToolbarSelect;
import com.gc.gwt.wysiwyg.client.EditorUtils;
-import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.Widget;
-
-public class FontStyleButton extends EditorToolbarSelect implements
ChangeListener {
+
+public class FontStyleButton extends EditorToolbarSelect implements
ChangeHandler {
private Editor editor;
@@ -33,8 +33,8 @@
init();
}
- public void onChange(Widget sender) {
- ListBox subj = ((ListBox) sender);
+ public void onChange(ChangeEvent event) {
+ ListBox subj = ((ListBox) event.getSource());
String value = subj.getValue(subj.getSelectedIndex());
subj.setSelectedIndex(0);
EditorUtils.doFocus(editor.getEditorWYSIWYG().getFrame().getElement());
@@ -47,6 +47,6 @@
for (int i = 0; i < formats.length; i++) {
this.addItem(formats[i][0], formats[i][1]);
}
- this.addChangeListener(this);
+ this.addChangeHandler(this);
}
}
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/ForegroundColorButton.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/ForegroundColorButton.java
Thu Jan 21 19:45:27 2010
@@ -22,12 +22,12 @@
import com.gc.gwt.wysiwyg.client.defaults.DefaultConstants;
import com.gc.gwt.wysiwyg.client.defaults.EditorColorPicker;
import com.gc.gwt.wysiwyg.client.defaults.EditorColorSelectListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
public class ForegroundColorButton
extends EditorToolbarButton
- implements EditorColorSelectListener, ClickListener {
+ implements EditorColorSelectListener, ClickHandler {
private Editor editor;
private EditorColorPicker fgPicker;
@@ -44,7 +44,7 @@
EditorUtils.doFocus(editor.getEditorWYSIWYG().getFrame().getElement());
}
- public void onClick(Widget sender) {
+ public void onClick(ClickEvent event) {
EditorUtils.saveSelection(editor.getEditorWYSIWYG().getFrame().getElement());
fgPicker.show();
fgPicker.setPopupPosition(editor.getAbsoluteLeft() + 50,
editor.getAbsoluteTop() + 50);
@@ -53,6 +53,6 @@
private void init() {
this.fgPicker = new EditorColorPicker("Select Text Color");
this.fgPicker.addSelectListener(this);
- this.addClickListener(this);
+ this.addClickHandler(this);
}
}
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/InsertImageButton.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/InsertImageButton.java
Thu Jan 21 19:45:27 2010
@@ -22,20 +22,20 @@
import com.gc.gwt.wysiwyg.client.defaults.DefaultConstants;
import com.gc.gwt.wysiwyg.client.defaults.EditorCommand;
import com.gc.gwt.wysiwyg.client.defaults.SimpleOneFieldPromptBox;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
-
-public class InsertImageButton extends EditorToolbarButton implements
ClickListener {
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+
+public class InsertImageButton extends EditorToolbarButton implements
ClickHandler {
private Editor editor;
public InsertImageButton(Editor editor) {
super(DefaultConstants.BUTTON_IMAGE);
this.editor = editor;
- this.addClickListener(this);
+ this.addClickHandler(this);
}
- public void onClick(Widget sender) {
+ public void onClick(ClickEvent event) {
new SimpleOneFieldPromptBox(editor, new EditorCommand() {
public void exec(String[] params) {
EditorUtils.saveSelection(editor.getEditorWYSIWYG().getFrame().getElement());
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/LinkButton.java
Tue Apr 3 12:27:35 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/LinkButton.java
Thu Jan 21 19:45:27 2010
@@ -22,20 +22,20 @@
import com.gc.gwt.wysiwyg.client.defaults.DefaultConstants;
import com.gc.gwt.wysiwyg.client.defaults.EditorCommand;
import com.gc.gwt.wysiwyg.client.defaults.SimpleOneFieldPromptBox;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
-
-public class LinkButton extends EditorToolbarButton implements
ClickListener {
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+
+public class LinkButton extends EditorToolbarButton implements
ClickHandler {
private Editor editor;
public LinkButton(Editor editor) {
super(DefaultConstants.BUTTON_LINK);
this.editor = editor;
- this.addClickListener(this);
+ this.addClickHandler(this);
}
- public void onClick(Widget sender) {
+ public void onClick(ClickEvent event) {
new SimpleOneFieldPromptBox(editor, new EditorCommand() {
public void exec(String[] params) {
EditorUtils.saveSelection(editor.getEditorWYSIWYG().getFrame().getElement());
=======================================
---
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/ShowSourceButton.java
Tue Apr 3 12:27:35 2007
+++
/trunk/src/com/gc/gwt/wysiwyg/client/defaults/widgets/ShowSourceButton.java
Thu Jan 21 19:45:27 2010
@@ -19,20 +19,20 @@
import com.gc.gwt.wysiwyg.client.Editor;
import com.gc.gwt.wysiwyg.client.EditorToolbarButton;
import com.gc.gwt.wysiwyg.client.defaults.DefaultConstants;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
-
-public class ShowSourceButton extends EditorToolbarButton implements
ClickListener {
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+
+public class ShowSourceButton extends EditorToolbarButton implements
ClickHandler {
Editor editor;
public ShowSourceButton(Editor editor) {
super(DefaultConstants.BUTTON_SOURCE);
this.editor = editor;
- this.addClickListener(this);
+ this.addClickHandler(this);
}
- public void onClick(Widget sender) {
+ public void onClick(ClickEvent event) {
editor.getEditorWYSIWYG().toggleView();
}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/impl/EditorUtilsImpl.java Tue Apr
3 12:27:35 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/impl/EditorUtilsImpl.java Thu Jan
21 19:45:27 2010
@@ -19,54 +19,81 @@
import com.gc.gwt.wysiwyg.client.EditorLoadListener;
import com.google.gwt.user.client.Element;
-public abstract class EditorUtilsImpl {
- public abstract void saveSelection(Element oIframe);
-
- public abstract void restoreSelection(Element oIframe);
-
- public abstract void enableDesignMode(Element oIframe,
EditorLoadListener loadListener);
+public class EditorUtilsImpl {
+ public void saveSelection(Element oIframe) {
+ }
+
+ public void restoreSelection(Element oIframe) {
+ }
+
+ public void enableDesignMode(Element oIframe, EditorLoadListener
loadListener) {
+ }
// Editing stuff
- public abstract void doRemoveFormat(Element oIframe);
-
- public abstract void doUndo(Element oIframe);
-
- public abstract void doRedo(Element oIframe);
-
- public abstract void doBold(Element oIframe);
-
- public abstract void doItalic(Element oIframe);
-
- public abstract void doUnderline(Element oIframe);
-
- public abstract void doSubscript(Element oIframe);
-
- public abstract void doSuperscript(Element oIframe);
-
- public abstract void doJustifyLeft(Element oIframe);
-
- public abstract void doJustifyCenter(Element oIframe);
-
- public abstract void doJustifyRight(Element oIframe);
-
- public abstract void doJustifyFull(Element oIframe);
-
- public abstract void doInsertOrderedList(Element oIframe);
-
- public abstract void doInsertUnorderedList(Element oIframe);
-
- public abstract void doUnLink(Element oIframe);
-
- public abstract void doCreateLink(Element oIframe, String url);
-
- public abstract void doInsertImage(Element oIframe, String url);
-
- public abstract void doForeColor(Element oIframe, String color);
-
- public abstract void doBackgroundColor(Element oIframe, String color);
-
- public abstract void doFontStyle(Element oIframe, String style);
-
- public abstract void doFontSize(Element oIframe, String size);
-}
+ public void doRemoveFormat(Element oIframe) {
+ }
+
+ public void doUndo(Element oIframe) {
+ }
+
+ public void doRedo(Element oIframe) {
+ }
+
+ public void doBold(Element oIframe) {
+ }
+
+ public void doItalic(Element oIframe) {
+ }
+
+ public void doUnderline(Element oIframe) {
+ }
+
+ public void doSubscript(Element oIframe) {
+ }
+
+ public void doSuperscript(Element oIframe) {
+ }
+
+ public void doJustifyLeft(Element oIframe) {
+ }
+
+ public void doJustifyCenter(Element oIframe) {
+ }
+
+ public void doJustifyRight(Element oIframe) {
+ }
+
+ public void doJustifyFull(Element oIframe) {
+ }
+
+ public void doInsertOrderedList(Element oIframe) {
+ }
+
+ public void doInsertUnorderedList(Element oIframe) {
+ }
+
+ public void doUnLink(Element oIframe) {
+ }
+
+ public void doCreateLink(Element oIframe, String url) {
+ }
+
+ public void doInsertImage(Element oIframe, String url) {
+ }
+
+ public void doForeColor(Element oIframe, String color) {
+ }
+
+ public void doBackgroundColor(Element oIframe, String color) {
+ }
+
+ public void doFontStyle(Element oIframe, String style) {
+ }
+
+ public void doFontSize(Element oIframe, String size) {
+ }
+
+ public void doFontName(Element iframe, String name) {
+ }
+}
=======================================
--- /trunk/src/com/gc/gwt/wysiwyg/client/impl/EditorUtilsImplCommon.java
Tue Apr 3 12:27:35 2007
+++ /trunk/src/com/gc/gwt/wysiwyg/client/impl/EditorUtilsImplCommon.java
Thu Jan 21 19:45:27 2010
@@ -140,4 +140,9 @@
EditorUtils.restoreSelection(oIframe);
EditorUtils.execCommand(oIframe, "FormatBlock", false, style);
}
-}
+
+ public void doFontName(Element oIframe, String name) {
+ EditorUtils.restoreSelection(oIframe);
+ EditorUtils.execCommand(oIframe, "FontName", false, name);
+ }
+}
=======================================
--- /trunk/test/com/gc/gwt/wysiwyg/test/client/Test.java Thu Jan 25
08:40:58 2007
+++ /trunk/test/com/gc/gwt/wysiwyg/test/client/Test.java Thu Jan 21
19:45:27 2010
@@ -19,13 +19,13 @@
import com.gc.gwt.ext.client.SplitPane;
import com.gc.gwt.wysiwyg.client.Editor;
import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.TabPanel;
-import com.google.gwt.user.client.ui.Widget;
public class Test implements EntryPoint {
@@ -64,8 +64,8 @@
// tab 3
final Button button = new Button("Show Editor");
- button.addClickListener(new ClickListener() {
- public void onClick(Widget sender) {
+ button.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent event) {
DialogBox db = new DialogBox(true);
Editor editor3 = new Editor();
editor3.setWidth("660px");
=======================================
--- /trunk/test/com/gc/gwt/wysiwyg/test/public/Test.html Thu Jan 25
08:40:58 2007
+++ /trunk/test/com/gc/gwt/wysiwyg/test/public/Test.html Thu Jan 21
19:45:27 2010
@@ -129,7 +129,7 @@
</style>
</head>
<body>
- <script language="javascript" src="gwt.js"></script>
+ <script language="javascript"
src="com.gc.gwt.wysiwyg.test.Test.nocache.js"></script>
<iframe id="__gwt_historyFrame"
style="width:0px;height:0px;border:0px"></iframe>
<div id="gwtAppContainer" style="width: 100%; height: 100%;"></div>
</body>