From 90d4d8e57ca805e3f2eded4b46f08ad1753fdc0c Mon Sep 17 00:00:00 2001 From: Andrei Solntsev Date: Fri, 19 Jul 2024 20:37:34 +0300 Subject: [PATCH] #349 rename package "org.xhtmlrenderer.simple" in module "flaying-saucer-swt" to avoid the collision when the same package is found in two modules ("flaying-saucer-core" and "flaying-saucer-swt"). Java 9 modules doesn't allow such a collision. --- .../main/java/org/xhtmlrenderer/demo/browser/swt/Browser.java | 2 +- .../xhtmlrenderer/demo/browser/swt/actions/AboutAction.java | 2 +- .../org/xhtmlrenderer/swt/FormControlReplacementElement.java | 2 +- .../src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java | 2 +- .../{simple/xhtml/swt => swt/simple}/SWTButtonControl.java | 2 +- .../{simple/xhtml/swt => swt/simple}/SWTCheckControl.java | 2 +- .../{simple/xhtml/swt => swt/simple}/SWTFormControl.java | 2 +- .../{simple/xhtml/swt => swt/simple}/SWTSelectControl.java | 2 +- .../{simple/xhtml/swt => swt/simple}/SWTTextControl.java | 2 +- .../org/xhtmlrenderer/{ => swt}/simple/SWTXHTMLRenderer.java | 3 +-- .../{simple/xhtml/swt => swt/simple}/SWTXhtmlControl.java | 2 +- .../swt => swt/simple}/SWTXhtmlReplacedElementFactory.java | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{simple/xhtml/swt => swt/simple}/SWTButtonControl.java (98%) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{simple/xhtml/swt => swt/simple}/SWTCheckControl.java (98%) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{simple/xhtml/swt => swt/simple}/SWTFormControl.java (96%) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{simple/xhtml/swt => swt/simple}/SWTSelectControl.java (99%) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{simple/xhtml/swt => swt/simple}/SWTTextControl.java (98%) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{ => swt}/simple/SWTXHTMLRenderer.java (97%) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{simple/xhtml/swt => swt/simple}/SWTXhtmlControl.java (98%) rename flying-saucer-swt/src/main/java/org/xhtmlrenderer/{simple/xhtml/swt => swt/simple}/SWTXhtmlReplacedElementFactory.java (99%) diff --git a/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/Browser.java b/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/Browser.java index 20c09dfa5..b08f2b496 100644 --- a/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/Browser.java +++ b/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/Browser.java @@ -64,7 +64,7 @@ import org.xhtmlrenderer.demo.browser.swt.actions.QuitAction; import org.xhtmlrenderer.demo.browser.swt.actions.ReloadAction; import org.xhtmlrenderer.event.DocumentListener; -import org.xhtmlrenderer.simple.SWTXHTMLRenderer; +import org.xhtmlrenderer.swt.simple.SWTXHTMLRenderer; import javax.annotation.CheckReturnValue; import javax.annotation.Nullable; diff --git a/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/actions/AboutAction.java b/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/actions/AboutAction.java index c3f15df9e..c4b29de23 100644 --- a/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/actions/AboutAction.java +++ b/flying-saucer-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/actions/AboutAction.java @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Shell; import org.xhtmlrenderer.demo.browser.swt.Browser; import org.xhtmlrenderer.demo.browser.swt.BrowserUserAgent; -import org.xhtmlrenderer.simple.SWTXHTMLRenderer; +import org.xhtmlrenderer.swt.simple.SWTXHTMLRenderer; import javax.annotation.Nullable; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/FormControlReplacementElement.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/FormControlReplacementElement.java index 39d3fb869..77199e0f5 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/FormControlReplacementElement.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/FormControlReplacementElement.java @@ -22,7 +22,7 @@ import org.xhtmlrenderer.css.style.CalculatedStyle; import org.xhtmlrenderer.extend.ReplacedElement; import org.xhtmlrenderer.layout.LayoutContext; -import org.xhtmlrenderer.simple.xhtml.swt.SWTFormControl; +import org.xhtmlrenderer.swt.simple.SWTFormControl; import java.awt.*; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java index 18046d33c..0d286e0ae 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/SWTOutputDevice.java @@ -36,7 +36,7 @@ import org.xhtmlrenderer.render.FSFont; import org.xhtmlrenderer.render.InlineText; import org.xhtmlrenderer.render.RenderingContext; -import org.xhtmlrenderer.simple.xhtml.swt.SWTFormControl; +import org.xhtmlrenderer.swt.simple.SWTFormControl; import javax.annotation.Nullable; import java.awt.*; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTButtonControl.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTButtonControl.java similarity index 98% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTButtonControl.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTButtonControl.java index 1c221a513..656705356 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTButtonControl.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTButtonControl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * }}} */ -package org.xhtmlrenderer.simple.xhtml.swt; +package org.xhtmlrenderer.swt.simple; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTCheckControl.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTCheckControl.java similarity index 98% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTCheckControl.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTCheckControl.java index 34c016ed1..f40cc06cb 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTCheckControl.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTCheckControl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * }}} */ -package org.xhtmlrenderer.simple.xhtml.swt; +package org.xhtmlrenderer.swt.simple; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTFormControl.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTFormControl.java similarity index 96% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTFormControl.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTFormControl.java index 72e42ed3d..ca417dfdf 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTFormControl.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTFormControl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * }}} */ -package org.xhtmlrenderer.simple.xhtml.swt; +package org.xhtmlrenderer.swt.simple; import org.eclipse.swt.widgets.Control; import org.xhtmlrenderer.simple.xhtml.FormControl; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTSelectControl.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTSelectControl.java similarity index 99% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTSelectControl.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTSelectControl.java index efdb48fe2..c50006fca 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTSelectControl.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTSelectControl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * }}} */ -package org.xhtmlrenderer.simple.xhtml.swt; +package org.xhtmlrenderer.swt.simple; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTTextControl.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTTextControl.java similarity index 98% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTTextControl.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTTextControl.java index 5999d838e..dd7bd0072 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTTextControl.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTTextControl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * }}} */ -package org.xhtmlrenderer.simple.xhtml.swt; +package org.xhtmlrenderer.swt.simple; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/SWTXHTMLRenderer.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXHTMLRenderer.java similarity index 97% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/SWTXHTMLRenderer.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXHTMLRenderer.java index fb0c7eae4..ec170b75f 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/SWTXHTMLRenderer.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXHTMLRenderer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * }}} */ -package org.xhtmlrenderer.simple; +package org.xhtmlrenderer.swt.simple; import org.eclipse.swt.widgets.Composite; import org.w3c.dom.Document; @@ -26,7 +26,6 @@ import org.xhtmlrenderer.extend.UserAgentCallback; import org.xhtmlrenderer.simple.xhtml.XhtmlForm; import org.xhtmlrenderer.simple.xhtml.XhtmlNamespaceHandler; -import org.xhtmlrenderer.simple.xhtml.swt.SWTXhtmlReplacedElementFactory; import org.xhtmlrenderer.swt.BasicRenderer; import org.xhtmlrenderer.swt.CursorListener; import org.xhtmlrenderer.swt.HoverListener; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTXhtmlControl.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXhtmlControl.java similarity index 98% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTXhtmlControl.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXhtmlControl.java index 1d349d235..ed54c0984 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTXhtmlControl.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXhtmlControl.java @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * }}} */ -package org.xhtmlrenderer.simple.xhtml.swt; +package org.xhtmlrenderer.swt.simple; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Device; diff --git a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTXhtmlReplacedElementFactory.java b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXhtmlReplacedElementFactory.java similarity index 99% rename from flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTXhtmlReplacedElementFactory.java rename to flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXhtmlReplacedElementFactory.java index c1f4b4c95..33aa5edcb 100644 --- a/flying-saucer-swt/src/main/java/org/xhtmlrenderer/simple/xhtml/swt/SWTXhtmlReplacedElementFactory.java +++ b/flying-saucer-swt/src/main/java/org/xhtmlrenderer/swt/simple/SWTXhtmlReplacedElementFactory.java @@ -1,4 +1,4 @@ -package org.xhtmlrenderer.simple.xhtml.swt; +package org.xhtmlrenderer.swt.simple; import org.w3c.dom.Element; import org.w3c.dom.Node;