Small update

MyInjectEventApp updated due to AndroidScreencastClient updates.
misc changes in code style.

Author: Iurii Sergiichuk

src/MyInjectEventApp.jar

@@ -21,7 +21,7 @@ public static void transfert(InputStream is, OutputStream os) {
 		}
 	}
 
-	public static void transfertResource(Class c, String resourceName,
+	public static void transfertResource(Class<?> c, String resourceName,
 			File output) {
 		InputStream resStream = c.getResourceAsStream(resourceName);
 		if (resStream == null)

src/com/github/xsavikx/android/screencast/api/StreamUtils.java

@@ -191,6 +191,7 @@ public void run() {
 			}
 		}
 	}
+
 	/**
 	 * @return true if there was a client running
 	 */
@@ -222,6 +223,7 @@ private static boolean killRunningAgent() {
 		}
 		return false;
 	}
+
 	/**
 	 * Logger for this class
 	 */
@@ -328,12 +330,12 @@ private void injectData(String data) {
 		}
 	}
 
-	public void injectKeycode(int type, int keyCode) {
+	public void injectKeycode(int keyCode) {
 		if (logger.isDebugEnabled()) {
-			logger.debug("injectKeycode(int, int) - start");
+			logger.debug("injectKeycode( int) - start");
 		}
 
-		String cmdList = "key/" + type + "/" + keyCode;
+		String cmdList = "key/" + keyCode;
 		injectData(cmdList);
 
 		if (logger.isDebugEnabled()) {

src/com/github/xsavikx/android/screencast/api/injector/Injector.java

@@ -16,7 +16,6 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
-import javax.swing.ListModel;
 
 import com.android.ddmlib.IDevice;
 
@@ -95,9 +94,6 @@ private void initialize() {
 			public void mouseClicked(MouseEvent e) {
 				if (e.getClickCount() == 2) {
 					int index = jlDevices.locationToIndex(e.getPoint());
-					ListModel dlm = jlDevices.getModel();
-					Object item = dlm.getElementAt(index);
-					;
 					jlDevices.ensureIndexIsVisible(index);
 					cancelled = false;
 					setVisible(false);

src/com/github/xsavikx/android/screencast/ui/JDialogDeviceList.java

@@ -38,6 +38,7 @@ class InjectMouseAdapter extends MouseAdapter {
 		private int dragFromY = -1;
 		private long timeFromPress = -1;
 		private final static long ONE_SECOND = 1000L;
+
 		@Override
 		public void mouseClicked(MouseEvent e) {
 			if (JFrameMain.this.injector == null)
@@ -85,15 +86,14 @@ public void mouseWheelMoved(MouseWheelEvent arg0) {
 			if (JFrameMain.this.injector == null)
 				return;
 			try {
-				// injector.injectKeycode(ConstEvtKey.ACTION_DOWN,code);
-				// injector.injectKeycode(ConstEvtKey.ACTION_UP,code);
 				JFrameMain.this.injector.injectTrackball(arg0
 						.getWheelRotation() < 0 ? -1f : 1f);
 			} catch (IOException e) {
 				throw new RuntimeException(e);
 			}
 		}
 	}
+
 	public class KbActionListener implements ActionListener {
 
 		int key;
@@ -106,11 +106,11 @@ public KbActionListener(int key) {
 		public void actionPerformed(ActionEvent e) {
 			if (injector == null)
 				return;
-			// injector.injectKeycode(ConstEvtKey.ACTION_DOWN, key);
-			injector.injectKeycode(ConstEvtKey.ACTION_UP, key);
+			injector.injectKeycode(key);
 		}
 
 	}
+
 	private static final long serialVersionUID = -2085909236767692371L;
 	private JPanelScreen jp = new JPanelScreen();
 	private JToolBar jtb = new JToolBar();
@@ -145,14 +145,9 @@ public boolean dispatchKeyEvent(KeyEvent e) {
 							return false;
 						if (injector == null)
 							return false;
-						if (e.getID() == KeyEvent.KEY_PRESSED) {
-							int code = KeyCodeConverter.getKeyCode(e);
-							injector.injectKeycode(ConstEvtKey.ACTION_DOWN,
-									code);
-						}
-						if (e.getID() == KeyEvent.KEY_RELEASED) {
+						if (e.getID() == KeyEvent.KEY_TYPED) {
 							int code = KeyCodeConverter.getKeyCode(e);
-							injector.injectKeycode(ConstEvtKey.ACTION_UP, code);
+							injector.injectKeycode(code);
 						}
 						return false;
 					}

src/com/github/xsavikx/android/screencast/ui/JFrameMain.java

@@ -28,17 +28,8 @@
 
 public class JFrameExplorer extends JFrame {
 
-	private class FileTreeNode extends DefaultMutableTreeNode {
-		FileInfo fi;
-
-		public FileTreeNode(FileInfo fi) {
-			super(fi.name);
-			this.fi = fi;
-		}
-
-	}
 	private class FolderTreeNode extends LazyMutableTreeNode {
-
+		private static final long serialVersionUID = 9131974430354670263L;
 		String name;
 		String path;
 
@@ -66,6 +57,7 @@ public String toString() {
 		}
 
 	}
+
 	/**
 	 * 
 	 */
@@ -120,7 +112,7 @@ public void valueChanged(TreeSelectionEvent e) {
 			public void mouseClicked(MouseEvent e) {
 				if (e.getClickCount() == 2) {
 					int index = jListFichiers.locationToIndex(e.getPoint());
-					ListModel dlm = jListFichiers.getModel();
+					ListModel<Object> dlm = jListFichiers.getModel();
 					FileInfo item = (FileInfo) dlm.getElementAt(index);
 					;
 					launchFile(item);