Renaming browser.BrowserBase to Base

luwrain · Jul 20, 2020 · 66bd1aa · 66bd1aa
1 parent 09f4b5b
commit 66bd1aa
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/...teraction/javafx/browser/BrowserBase.java → ...rain/interaction/javafx/browser/Base.java b/...teraction/javafx/browser/BrowserBase.java → ...rain/interaction/javafx/browser/Base.java
@@ -35,7 +35,7 @@
 import org.luwrain.interaction.javafx.*;
 import org.luwrain.browser.BrowserEvents;
 
-abstract class BrowserBase
+abstract class Base
 {
  static final String LOG_COMPONENT = "web";
 
@@ -60,13 +60,13 @@ static final class DomScanResult
  protected JSObject injectionRes = null;
  protected JSObject jsWindow = null;
 
- protected BrowserBase(String injectedScript)
+ protected Base(String injectedScript)
  {
  NullCheck.notNull(injectedScript, "injectedScript");
  this.injectedScript = injectedScript;
  }
 
- public abstract void setVisibility(boolean enabled);
+ abstract void setVisibility(boolean enabled);
 
  protected void init(BrowserEvents events)
  {
@@ -229,7 +229,7 @@ private void onKeyReleased(KeyEvent event)
  }
  }
 
- static public long jsLong(Object o)
+ static long jsLong(Object o)
  {
  if(o == null) 
 return 0;

diff --git a/src/main/java/org/luwrain/interaction/javafx/browser/BrowserImpl.java b/src/main/java/org/luwrain/interaction/javafx/browser/BrowserImpl.java
@@ -17,29 +17,29 @@
 
 package org.luwrain.interaction.javafx.browser;
 
-import java.awt.Rectangle;
+//import java.awt.Rectangle;
 import java.io.*;
-import java.util.*;
+//import java.util.*;
 import java.util.concurrent.*;
 
-import javafx.application.Platform;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Worker.State;
-import javafx.scene.web.WebEngine;
-import javafx.scene.web.WebView;
-import javafx.scene.input.KeyEvent;
-import netscape.javascript.JSObject;
+//import javafx.application.Platform;
+//import javafx.beans.value.ObservableValue;
+//import javafx.concurrent.Worker.State;
+//import javafx.scene.web.WebEngine;
+//import javafx.scene.web.WebView;
+//import javafx.scene.input.KeyEvent;
+//import netscape.javascript.JSObject;
 
-import org.w3c.dom.Node;
-import org.w3c.dom.html.*;
-import org.w3c.dom.views.DocumentView;
-import com.sun.webkit.dom.DOMWindowImpl;
+//import org.w3c.dom.Node;
+//import org.w3c.dom.html.*;
+//import org.w3c.dom.views.DocumentView;
+//import com.sun.webkit.dom.DOMWindowImpl;
 
 import org.luwrain.core.*;
-import org.luwrain.browser.*;
+import org.luwrain.browser.BrowserEvents;
 import org.luwrain.interaction.javafx.*;
 
-public final class BrowserImpl extends BrowserBase implements Browser
+public final class BrowserImpl extends Base implements org.luwrain.browser.Browser
 {
  static private final String RESCAN_RESOURCE_PATH = "org/luwrain/interaction/javafx/injection.js";
  static final int LAST_MODIFIED_SCAN_INTERVAL = 100; // lastModifiedTime rescan interval in milliseconds
@@ -166,7 +166,7 @@ private boolean initialized()
  return Utils.callInFxThreadSync(()->super.executeScript(script));
  }
 
- @Override public BrowserIterator createIterator()
+ @Override public org.luwrain.browser.BrowserIterator createIterator()
  {
  InvalidThreadException.checkThread("BrowserImpl.createIterator()");
  return new IteratorImpl(this);

diff --git a/src/main/java/org/luwrain/interaction/javafx/browser/IteratorImpl.java b/src/main/java/org/luwrain/interaction/javafx/browser/IteratorImpl.java
@@ -31,17 +31,17 @@
 
 final class IteratorImpl implements BrowserIterator
 {
- static private final String LOG_COMPONENT = BrowserBase.LOG_COMPONENT;
+ static private final String LOG_COMPONENT = Base.LOG_COMPONENT;
 
- private final BrowserBase browser;
+ private final Base browser;
  private int pos;
 
  //Set by prepare() function
  private BrowserImpl.DomScanResult scanRes = null;
  private List<NodeInfo> dom = null;
  private NodeInfo nodeInfo = null;
 
- IteratorImpl(BrowserBase browser, int pos)
+ IteratorImpl(Base browser, int pos)
  {
  NullCheck.notNull(browser, "browser");
  if (pos < 0)
@@ -50,7 +50,7 @@ final class IteratorImpl implements BrowserIterator
  this.pos = pos;
  }
 
- IteratorImpl (BrowserBase browser)
+ IteratorImpl (Base browser)
  {
  this(browser, 0);
  }