Skip to content

Commit

Permalink
#349 rename package "org.xhtmlrenderer.simple" in module "flaying-sau…
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
asolntsev committed Jul 19, 2024
1 parent e59c0a5 commit 90d4d8e
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 90d4d8e

Please sign in to comment.