#349 rename package "org.xhtmlrenderer.simple" in module "flaying-sau…

…cer-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.
flyingsaucerproject · Jul 19, 2024 · 90d4d8e · 90d4d8e
1 parent e59c0a5
commit 90d4d8e
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 13 deletions.
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
@@ -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/...er-swt-examples/src/main/java/org/xhtmlrenderer/demo/browser/swt/actions/AboutAction.java b/...er-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
@@ -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
@@ -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/...er/simple/xhtml/swt/SWTButtonControl.java → ...renderer/swt/simple/SWTButtonControl.java b/...er/simple/xhtml/swt/SWTButtonControl.java → ...renderer/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/...rer/simple/xhtml/swt/SWTCheckControl.java → ...lrenderer/swt/simple/SWTCheckControl.java b/...rer/simple/xhtml/swt/SWTCheckControl.java → ...lrenderer/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/...erer/simple/xhtml/swt/SWTFormControl.java → ...mlrenderer/swt/simple/SWTFormControl.java b/...erer/simple/xhtml/swt/SWTFormControl.java → ...mlrenderer/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/...er/simple/xhtml/swt/SWTSelectControl.java → ...renderer/swt/simple/SWTSelectControl.java b/...er/simple/xhtml/swt/SWTSelectControl.java → ...renderer/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/...erer/simple/xhtml/swt/SWTTextControl.java → ...mlrenderer/swt/simple/SWTTextControl.java b/...erer/simple/xhtml/swt/SWTTextControl.java → ...mlrenderer/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/...htmlrenderer/simple/SWTXHTMLRenderer.java → ...renderer/swt/simple/SWTXHTMLRenderer.java b/...htmlrenderer/simple/SWTXHTMLRenderer.java → ...renderer/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/...rer/simple/xhtml/swt/SWTXhtmlControl.java → ...lrenderer/swt/simple/SWTXhtmlControl.java b/...rer/simple/xhtml/swt/SWTXhtmlControl.java → ...lrenderer/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/...l/swt/SWTXhtmlReplacedElementFactory.java → ...imple/SWTXhtmlReplacedElementFactory.java b/...l/swt/SWTXhtmlReplacedElementFactory.java → ...imple/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;