Merge pull request #90 from BobHanson/master

BobHanson · web-flow · commit f2ed22a36300 · 2018-11-21T14:28:43.000-06:00
antialias, menus, scrollbars, URLConnection.useCache()/.useDefaultCache()
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20181120230421 
+20181121134911 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20181120230421 
+20181121134911 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/AjaxURLConnection.java b/sources/net.sf.j2s.java.core/src/javajs/util/AjaxURLConnection.java
@@ -6,6 +6,8 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Hashtable;
+import java.util.Map;
 
 import javajs.api.js.J2SObjectInterface;
 
@@ -71,7 +73,25 @@ public void outputString(String post) {
 	public InputStream getInputStream() {
 		responseCode = 200;
 		BufferedInputStream is = getAttachedStreamData(url, false);
-		return (is == null ? attachStreamData(url, doAjax(true)) : is);
+		if (is != null || getUseCaches() && (is = getCachedStream(url)) != null)
+			return is;
+		is = attachStreamData(url, doAjax(true));
+		if (getUseCaches() && is != null)
+			setCachedStream(url);
+		return is;
+	}
+
+	static Map<String, Object> urlCache = new Hashtable<String, Object>();
+	
+	private BufferedInputStream getCachedStream(URL url) {
+		Object data = urlCache.get(url.toString());
+		return (data == null ? null : Rdr.toBIS(data));
+	}
+
+	private void setCachedStream(URL url) {
+		Object data = url._streamData;
+		if (data != null)
+			urlCache.put(url.toString(), data);
 	}
 
 	/**
@@ -96,6 +116,7 @@ public static BufferedInputStream getAttachedStreamData(URL url, boolean andDele
 	}
 
    public static BufferedInputStream attachStreamData(URL url, Object o) {
+	   
 	   /**
 	    * @j2sNative
 	    * 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -98,20 +98,18 @@ public JSGraphics2D(Object canvas) { // this must be Object, because we are
 		 */
 		{
 		}
-		// removed - caused blurriness 9/17/2018		
 //		// reduce antialiasing, thank you,
 //		// http://www.rgraph.net/docs/howto-get-crisp-lines-with-no- antialias.html
-		// having this set default TRUE gave extra lines around panels in Jalview
-		setAntialias(false);
+		setAntialias(true);
 	}
 
 	public void setAntialias(boolean tf) {
 		if (tf) {
 			if (!isShifted)
-				ctx.translate(-0.5, -0.5);
+				ctx.translate(0.5, 0.5);
 		} else {
 			if (isShifted)
-				ctx.translate(0.5, 0.5);
+				ctx.translate(-0.5, -0.5);
 		}
 		// this is important if images are being drawn - test/TAPP6
 		// see also http://vaughnroyko.com/state-of-nearest-neighbor-interpolation-in-canvas/
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
@@ -125,7 +125,7 @@ Swing.__getMenuStyle = function(applet) { return '\
 	.swingjsPopupMenu .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;position:absolute;top:.2em;left:.2em}\
 	.swingjsPopupMenu .ui-menu-icon{position:static;float:right}\
 	.swingjsPopupMenu .ui-icon-carat-1-e{min-width:10ex;text-align:right;background-image:none;background-position:0 0}\
-	.swingjsPopupMenu .ui-icon-carat-1-e:after{content:"\\0023F5"}\
+	.swingjsPopupMenu .ui-icon-carat-1-e:after{content:"\\0025B6"}\
 	.swingjsPopupMenu .ui-state-default{border:1px solid #c5dbec;background:#dfeffc;color:#2e6e9e}\
 	.swingjsPopupMenu .ui-state-default a{color:#2e6e9e;text-decoration:none}\
 	.swingjsPopupMenu .ui-state-hover,.swingjsPopupMenu .ui-state-focus{border:1px solid #79b7e7;background:#d0e5f5;color:#1d5987}\
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/jquery-ui-j2sslider.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/jquery-ui-j2sslider.js
@@ -618,7 +618,7 @@
 				},
 				
 				_getPixelMouse : function(position, offsetHandle) {
-					var offset = this.element.offset;
+					var offset = this.element.offset();
 					var p = (this.orientation === "horizontal" ?
 							position.x
 								- offset.left
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuUI.java
@@ -8,8 +8,8 @@
 import javax.swing.JComponent;
 import javax.swing.JMenu;
 import swingjs.api.js.DOMNode;
-public class JSMenuUI extends JSMenuItemUI implements ContainerListener {
-
+public class JSMenuUI extends JSMenuItemUI {
+	
 	private JMenu jm;
 
 	public JSMenuUI() {
@@ -76,8 +76,6 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 	public void installUI(JComponent jc) {
 		jm = (JMenu) jc;
 		super.installUI(jc);
-		// handle add/remove
-		jm.getPopupMenu().addContainerListener(this);
 	}
 
 	@Override
@@ -91,22 +89,4 @@ public Dimension getMaximumSize() {
 		return getPreferredSize();
 	}
 
-	@Override
-	public void componentAdded(ContainerEvent e) {
-		JSPopupMenuUI popupui = (JSPopupMenuUI) jm.getPopupMenu().getUI();
-		// OK, the idea here is that we detach all child nodes
-		// and then reattach them. 
-		DOMNode.detachAll(popupui.outerNode);
-		popupui.setTainted();
-		popupui.setHTMLElement();
-	}
-
-	@Override
-	public void componentRemoved(ContainerEvent e) {
-		JSPopupMenuUI popupui = (JSPopupMenuUI) jm.getPopupMenu().getUI();
-		DOMNode.detachAll(popupui.outerNode);
-		popupui.setTainted();
-		popupui.setHTMLElement();
-	}
-
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPopupMenuUI.java
@@ -4,6 +4,8 @@
 import java.awt.Dimension;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
+import java.awt.event.ContainerEvent;
+import java.awt.event.ContainerListener;
 
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
@@ -13,17 +15,35 @@
 import swingjs.jquery.JQueryUI;
 import swingjs.api.js.DOMNode;
 
-public class JSPopupMenuUI extends JSPanelUI {
+public class JSPopupMenuUI extends JSPanelUI implements ContainerListener {
+
 	
 	static {
 		Object jqueryui = JQueryUI.class; // loads jQuery.ui
 	}
 
 	// a frameless independent window
 	
-	static JSSwingMenu j2sSwingMenu;
+	private static JSSwingMenu j2sSwingMenu;
 	
-	int timer;
+
+	@Override
+	public void componentAdded(ContainerEvent e) {
+		// OK, the idea here is that we detach all child nodes
+		// and then reattach them. 
+		DOMNode.detachAll(outerNode);
+		setTainted();
+		setHTMLElement();
+	}
+
+	@Override
+	public void componentRemoved(ContainerEvent e) {
+		DOMNode.detachAll(outerNode);
+		setTainted();
+		setHTMLElement();
+	}
+
+	/*private*/ int timer;
 
 	public JSPopupMenuUI() {
 		
@@ -51,6 +71,7 @@ public DOMNode updateDOMNode() {
 
 	@Override
 	public void installUI(JComponent jc) {
+		((JPopupMenu) jc).addContainerListener(this);
       LookAndFeel.installColorsAndFont(jc,
         "PopupMenu.background",
         "PopupMenu.foreground",
@@ -59,6 +80,7 @@ public void installUI(JComponent jc) {
 
 	@Override
 	public void uninstallUI(JComponent jc) {
+		((JPopupMenu) jc).removeContainerListener(this);
 		// TODO Auto-generated method stub
 		
 	}
@@ -122,14 +144,16 @@ void stopTimer() {
 	void hideMenu() {
 		System.out.println("hideMenu");
 		// not private -- hideMenu$
-		j2sSwingMenu.hideMenu(menu);	
+		if (menu != null)
+			j2sSwingMenu.hideMenu(menu);	
 	}
 	
 	@Override
 	public void dispose() {
     DOMNode.dispose(domNode);
     DOMNode.dispose(outerNode);
-    j2sSwingMenu.disposeMenu(menu);
+    if (menu != null)
+    	j2sSwingMenu.disposeMenu(menu);
 	}
 
 	@Override
diff --git a/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java b/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java
@@ -11,6 +11,8 @@
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -22,6 +24,7 @@
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.JRadioButton;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.SwingConstants;
@@ -59,6 +62,50 @@ void doTest()
     main.getJMenuBar().add(menu);
     main.pack();
     main.setVisible(true);
+    
+    JPopupMenu pmenu = new JPopupMenu();
+    pmenu.add(new JMenuItem("testing1"));
+    pmenu.add(new JMenuItem("testing2"));
+    pmenu.add(new JMenuItem("testing3"));
+
+    main.addMouseListener(new MouseListener() {
+
+		@Override
+		public void mouseClicked(MouseEvent e) {
+			System.out.println(pmenu.getComponents().length);
+			pmenu.remove(pmenu.getComponents().length - 1);
+			System.out.println(pmenu.getComponents().length);
+			pmenu.show(main,  100,  100);
+			System.out.println(pmenu.getComponents().length);
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public void mousePressed(MouseEvent e) {
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public void mouseReleased(MouseEvent e) {
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public void mouseEntered(MouseEvent e) {
+			// TODO Auto-generated method stub
+			
+		}
+
+		@Override
+		public void mouseExited(MouseEvent e) {
+			// TODO Auto-generated method stub
+			
+		}
+    	
+    });
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -98,20 +98,18 @@ public JSGraphics2D(Object canvas) { // this must be Object, because we are`
`98`	`98`	`*/`
`99`	`99`	`{`
`100`	`100`	`}`
`101`		`- // removed - caused blurriness 9/17/2018`
`102`	`101`	`// // reduce antialiasing, thank you,`
`103`	`102`	`// // http://www.rgraph.net/docs/howto-get-crisp-lines-with-no- antialias.html`
`104`		`- // having this set default TRUE gave extra lines around panels in Jalview`
`105`		`- setAntialias(false);`
	`103`	`+ setAntialias(true);`
`106`	`104`	`}`
`107`	`105`
`108`	`106`	`public void setAntialias(boolean tf) {`
`109`	`107`	`if (tf) {`
`110`	`108`	`if (!isShifted)`
`111`		`- ctx.translate(-0.5, -0.5);`
	`109`	`+ ctx.translate(0.5, 0.5);`
`112`	`110`	`} else {`
`113`	`111`	`if (isShifted)`
`114`		`- ctx.translate(0.5, 0.5);`
	`112`	`+ ctx.translate(-0.5, -0.5);`
`115`	`113`	`}`
`116`	`114`	`// this is important if images are being drawn - test/TAPP6`
`117`	`115`	`// see also http://vaughnroyko.com/state-of-nearest-neighbor-interpolation-in-canvas/`