diff options
Diffstat (limited to 'systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools')
7 files changed, 58 insertions, 66 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java index 6c02d10b1d..ff626d5019 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ClientSession.java @@ -24,7 +24,6 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.structures.DMResponse; * @author patrickm * */ -@SuppressWarnings("deprecation") public final class ClientSession extends Thread { private static ClientSession instance = null; @@ -38,12 +37,12 @@ public final class ClientSession extends Thread { private ClientSession () { // only happens once - hostname = ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME); - portnumber = ConsoleLogPlugin.getDefault().getPluginPreferences().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER); - mbox = new TreeMap<Integer, LinkedBlockingQueue<byte[]>> (); - connected = createConnection (); - scriptnumber = 15; - if (connected) this.start(); + hostname = ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME); + portnumber = ConsoleLogPlugin.getDefault().getPreferenceStore().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER); + mbox = new TreeMap<Integer, LinkedBlockingQueue<byte[]>> (); + connected = createConnection (); + scriptnumber = 15; + if (connected) this.start(); } /** @@ -245,41 +244,41 @@ public final class ClientSession extends Thread { */ public boolean createConnection () { - final DMRequest ccpacket = new DMRequest (DMRequest.CREATE_CONN, 0, 0, 0); - final byte buffer[] = new byte[DMResponse.packetsize]; - final DMResponse respacket; - hostname = ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME); - portnumber = ConsoleLogPlugin.getDefault().getPluginPreferences().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER); - - OutputStream out = null; - try { - - Socket tmp = new Socket(hostname, portnumber); - out = tmp.getOutputStream(); - in = tmp.getInputStream(); - out.write(ccpacket.getData()); - out.flush(); - in.read(buffer, 0, buffer.length); - respacket = new DMResponse (buffer); - - } catch (final UnknownHostException uhe) { - new ErrorMessage("Unknown host!", "See stderr for more details").open(); - System.err.println("Unknown host: " + uhe.getMessage()); - return false; - } catch (final IOException ioe) { - new ErrorMessage("Connection I/O error!", "See stderr for more details").open(); - System.err.println("Con I/O error: " + ioe.getMessage()); - //ioe.printStackTrace(); - return false; - } - - if (!respacket.isValid()) - { - return false;} + final DMRequest ccpacket = new DMRequest (DMRequest.CREATE_CONN, 0, 0, 0); + final byte buffer[] = new byte[DMResponse.packetsize]; + final DMResponse respacket; + hostname = ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME); + portnumber = ConsoleLogPlugin.getDefault().getPreferenceStore().getInt(ConsoleLogPreferenceConstants.PORT_NUMBER); + + OutputStream out = null; + try { + + Socket tmp = new Socket(hostname, portnumber); + out = tmp.getOutputStream(); + in = tmp.getInputStream(); + out.write(ccpacket.getData()); + out.flush(); + in.read(buffer, 0, buffer.length); + respacket = new DMResponse (buffer); + + } catch (final UnknownHostException uhe) { + new ErrorMessage("Unknown host!", "See stderr for more details").open(); + System.err.println("Unknown host: " + uhe.getMessage()); + return false; + } catch (final IOException ioe) { + new ErrorMessage("Connection I/O error!", "See stderr for more details").open(); + System.err.println("Con I/O error: " + ioe.getMessage()); + //ioe.printStackTrace(); + return false; + } + + if (!respacket.isValid()) + { + return false;} + - - clientID = respacket.getclientID(); - return true; + clientID = respacket.getclientID(); + return true; } /** @@ -324,4 +323,4 @@ public final class ClientSession extends Thread { // // return rc; } -}
\ No newline at end of file +} diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java index a8056ea741..d505420ccc 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpClient.java @@ -11,7 +11,6 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPref import java.io.*; -@SuppressWarnings("deprecation") public class ScpClient { private Session session; @@ -20,8 +19,8 @@ public class ScpClient { //public static void main(String[] arg){ - String user=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER); - String host=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME); + String user=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER); + String host=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME); //System.out.println(lfile + " " + rfile); @@ -34,7 +33,7 @@ public class ScpClient { // username and password will be given via UserInfo interface. //UserInfo ui=new MyUserInfo(); //session.setUserInfo(ui); - session.setPassword(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); + session.setPassword(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); java.util.Properties config = new java.util.Properties(); config.put("StrictHostKeyChecking", "no"); session.setConfig(config); @@ -231,4 +230,4 @@ public class ScpClient { } } } -}
\ No newline at end of file +} diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java index 4d5da47e24..a164766e6f 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/ScpExec.java @@ -9,7 +9,6 @@ import com.jcraft.jsch.*; import java.io.*; import java.util.ArrayList; -@SuppressWarnings("deprecation") public class ScpExec implements Runnable { private Session session; @@ -53,14 +52,14 @@ public class ScpExec implements Runnable { protected boolean init() { - String user=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER); - String host=ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME); + String user=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER); + String host=ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME); try{ JSch jsch=new JSch(); session=jsch.getSession(user, host, 22); - session.setPassword(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); + session.setPassword(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); java.util.Properties config = new java.util.Properties(); config.put("StrictHostKeyChecking", "no"); @@ -300,4 +299,4 @@ public class ScpExec implements Runnable { public static final int ERROR_STREAM = 0; public static final int INPUT_STREAM = 1; -}
\ No newline at end of file +} diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java index dd81c63f3b..d3f728bd58 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SCPDetails.java @@ -15,7 +15,6 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.events.SelectionEvent; -@SuppressWarnings("deprecation") public class SCPDetails extends Dialog { private Text userText; private Text passwordText; @@ -51,7 +50,7 @@ public class SCPDetails extends Dialog { data.horizontalAlignment = SWT.FILL; userText = new Text(shell, SWT.SINGLE | SWT.BORDER); userText.setLayoutData(data); - userText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER)); + userText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER)); data = new GridData(); data.grabExcessHorizontalSpace = false; @@ -66,7 +65,7 @@ public class SCPDetails extends Dialog { passwordText = new Text(shell, SWT.SINGLE | SWT.BORDER); passwordText.setEchoChar('*'); passwordText.setLayoutData(data); - passwordText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); + passwordText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); data = new GridData(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java index a412969958..e79eb57b0e 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/dialogs/SelectServerDialog.java @@ -29,9 +29,8 @@ public class SelectServerDialog extends Dialog { super(parent); } - @SuppressWarnings("deprecation") public boolean open() { - if (ConsoleLogPlugin.getDefault().getPluginPreferences().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)) { + if (ConsoleLogPlugin.getDefault().getPreferenceStore().getBoolean(ConsoleLogPreferenceConstants.REMEMBER_SERVER)) { return true; } result = false; @@ -59,7 +58,7 @@ public class SelectServerDialog extends Dialog { data.horizontalAlignment = SWT.FILL; hostText = new Text(shell, SWT.SINGLE | SWT.BORDER); hostText.setLayoutData(data); - hostText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.HOST_NAME)); + hostText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.HOST_NAME)); data = new GridData(); data.grabExcessHorizontalSpace = false; @@ -73,7 +72,7 @@ public class SelectServerDialog extends Dialog { data.horizontalAlignment = SWT.FILL; userText = new Text(shell, SWT.SINGLE | SWT.BORDER); userText.setLayoutData(data); - userText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER)); + userText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER)); data = new GridData(); data.grabExcessHorizontalSpace = false; @@ -88,7 +87,7 @@ public class SelectServerDialog extends Dialog { passwordText = new Text(shell, SWT.SINGLE | SWT.BORDER); passwordText.setEchoChar('*'); passwordText.setLayoutData(data); - passwordText.setText(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); + passwordText.setText(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_PASSWORD)); data = new GridData(); diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java index fddb69175c..e7e6fbce01 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/internal/ConsoleLogPlugin.java @@ -33,10 +33,8 @@ public class ConsoleLogPlugin extends AbstractUIPlugin { /** * This method is called upon plug-in activation */ - @SuppressWarnings("deprecation") public void start(BundleContext context) throws Exception { super.start(context); - this.internalInitializeDefaultPluginPreferences(); } /** diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java index efadd52b15..ac948e8dce 100644 --- a/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java +++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.consolelog/src/org/eclipse/linuxtools/systemtap/ui/consolelog/structures/DMRequest.java @@ -21,7 +21,6 @@ import org.eclipse.linuxtools.systemtap.ui.consolelog.preferences.ConsoleLogPref * @author patrickm * */ -@SuppressWarnings("deprecation") public class DMRequest extends DMPacket { // packet size @@ -107,7 +106,7 @@ public class DMRequest extends DMPacket { char a[] = new char[20]; for (int i = 0; i < 20 ; i++) a[i] = ' '; - String b= ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER); + String b= ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER); b.getChars(0, b.length(), a, 0); b = null; @@ -121,7 +120,7 @@ public class DMRequest extends DMPacket { dos.writeInt(scriptID); dos.writeInt(clientID); dos.writeInt(0); - dos.writeInt(ConsoleLogPlugin.getDefault().getPluginPreferences().getString(ConsoleLogPreferenceConstants.SCP_USER).length()); + dos.writeInt(ConsoleLogPlugin.getDefault().getPreferenceStore().getString(ConsoleLogPreferenceConstants.SCP_USER).length()); dos.writeBytes(b); // System.out.println(a.length + " " + a.toString().length() + " " + filename.substring(filename.lastIndexOf('/')).length()); dos.flush(); @@ -195,4 +194,4 @@ public class DMRequest extends DMPacket { + "\nScript #:\t" + scriptID + "\nFilename:\t" + filename + "\nClient ID:\t" + clientID + "\nData Size:\t" + size + "\n"; } -}
\ No newline at end of file +} |