diff --git a/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs b/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs index e23000d..e24eb44 100644 --- a/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs +++ b/intrace.appengine/.settings/com.google.appengine.eclipse.core.prefs @@ -1,6 +1,6 @@ -#Mon Apr 09 00:58:55 BST 2012 +#Mon Apr 23 22:05:36 BST 2012 eclipse.preferences.version=1 -filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.5.5.jar|appengine-api-labs-1.5.5.jar|appengine-jsr107cache-1.5.5.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.9.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar +filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.6.1.jar|appengine-api-labs-1.6.1.jar|appengine-jsr107cache-1.6.1.jar|jsr107cache-1.1.jar|datanucleus-appengine-1.0.10.final.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar gaeDeployDialogSettings= gaeIsEclipseDefaultInstPath=true googleCloudSqlEnabled=false diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.5.5.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.1.jar similarity index 72% rename from intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.5.5.jar rename to intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.1.jar index db0f2cc..5a8a4b0 100644 Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.5.5.jar and b/intrace.appengine/war/WEB-INF/lib/appengine-api-1.0-sdk-1.6.1.jar differ diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.5.5.jar b/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.1.jar similarity index 63% rename from intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.5.5.jar rename to intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.1.jar index 1af39ab..5821a37 100644 Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.5.5.jar and b/intrace.appengine/war/WEB-INF/lib/appengine-api-labs-1.6.1.jar differ diff --git a/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.5.5.jar b/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.1.jar similarity index 71% rename from intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.5.5.jar rename to intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.1.jar index fc7e9c0..0c40682 100644 Binary files a/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.5.5.jar and b/intrace.appengine/war/WEB-INF/lib/appengine-jsr107cache-1.6.1.jar differ diff --git a/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.9.final.jar b/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.10.final.jar similarity index 80% rename from intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.9.final.jar rename to intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.10.final.jar index d8b7b96..9867b2e 100644 Binary files a/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.9.final.jar and b/intrace.appengine/war/WEB-INF/lib/datanucleus-appengine-1.0.10.final.jar differ diff --git a/intrace.ecl.feature/feature.xml b/intrace.ecl.feature/feature.xml index 3881b2d..6a4fca8 100644 --- a/intrace.ecl.feature/feature.xml +++ b/intrace.ecl.feature/feature.xml @@ -2,7 +2,7 @@ + version="0.19"> Enable launching Java Applications with the InTrace agent. @@ -215,6 +215,6 @@ litigation. id="intrace.ecl" download-size="0" install-size="0" - version="0.18.0"/> + version="0.19.0"/> diff --git a/intrace.ecl.plugin/META-INF/MANIFEST.MF b/intrace.ecl.plugin/META-INF/MANIFEST.MF index ce6fe97..38fbc10 100644 --- a/intrace.ecl.plugin/META-INF/MANIFEST.MF +++ b/intrace.ecl.plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: InTrace Eclipse Bundle-SymbolicName: intrace.ecl;singleton:=true -Bundle-Version: 0.18 +Bundle-Version: 0.19 Bundle-Activator: intrace.ecl.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/intrace.ecl.plugin/lib/intrace-agent.jar b/intrace.ecl.plugin/lib/intrace-agent.jar index 25925b6..46b02ee 100644 Binary files a/intrace.ecl.plugin/lib/intrace-agent.jar and b/intrace.ecl.plugin/lib/intrace-agent.jar differ diff --git a/intrace.ecl.plugin/lib/intrace-ui-helper.jar b/intrace.ecl.plugin/lib/intrace-ui-helper.jar index 90533cc..d0417da 100644 Binary files a/intrace.ecl.plugin/lib/intrace-ui-helper.jar and b/intrace.ecl.plugin/lib/intrace-ui-helper.jar differ diff --git a/org.intrace/lib/intrace-agent.jar b/org.intrace/lib/intrace-agent.jar index 25925b6..46b02ee 100644 Binary files a/org.intrace/lib/intrace-agent.jar and b/org.intrace/lib/intrace-agent.jar differ diff --git a/org.intrace/src/org/intrace/client/gui/helper/ClientStrings.java b/org.intrace/src/org/intrace/client/gui/helper/ClientStrings.java index 68e22fe..f9468c9 100644 --- a/org.intrace/src/org/intrace/client/gui/helper/ClientStrings.java +++ b/org.intrace/src/org/intrace/client/gui/helper/ClientStrings.java @@ -20,13 +20,13 @@ public class ClientStrings public static final String ENABLE_FILE_OUTPUT = "File"; public static final String ENABLE_NETWORK_OUTPUT = "Collect Trace"; public static final String ENABLE_FILTER = "Filter"; - - public static final String ENABLE_METHOD_FILTER = "Ingore Repeated Methods"; + + public static final String ENABLE_METHOD_FILTER = "Ignore Repeated Methods"; public static final String RESET_METHOD_FILTER = "Reset Repeated Methods"; public static final String DISCARD_FILTERED = "Discard Filtered Trace"; public static final String DISCARD_EXCESS = "Discard Excess Trace"; - + public static final String CONNECT = "Connect"; public static final String CONNECTING = "Connect..."; public static final String DISCONNECT = "Disconnect"; @@ -44,13 +44,13 @@ public class ClientStrings public static final String FILTER_TEXT = "Filter..."; public static final String CANCEL_TEXT = "Cancel"; public static final String SAVE_TEXT = "Save..."; - + public static final String CLASS_TITLE = "Classes to Instrument"; public static final String CLASS_HELP_TEXT = "Enter complete or partial class names.\n\n " + "e.g.\n" + "\"mypack.mysubpack.MyClass\"\n" + "\"MyClass\""; - + public static final String FILTER_HELP_TEXT = "Enter text to match against trace lines. " + "You can match any part of the line. " + "\n\nYou can also select some text and right click the " + diff --git a/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java b/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java index 18f6991..1a21084 100644 --- a/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java +++ b/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java @@ -109,7 +109,7 @@ public class IncludeExcludeWindow tabs = null; ctabs = new CTabFolder(sWindow, SWT.TOP | SWT.BORDER); ctabs.setSimple(false); - ctabs.setLayoutData("grow,wrap,wmin 0,hmin 0,spanx 4"); + ctabs.setLayoutData("grow,wrap,wmin 0,hmin 0,wmin 0,spanx 4"); fillCTabs(ctabs, initIncludePatterns, initExcludePatterns, helpText); ctabs.setSelection(0); if (this.modedata != null) @@ -196,7 +196,7 @@ public class IncludeExcludeWindow patternInputComp = new Composite(parent, SWT.NONE); MigLayout inputLayout = new MigLayout("fill", "[grow]", "[25][grow]"); patternInputComp.setLayout(inputLayout); - patternInputComp.setLayoutData("grow,wrap,spanx,hmin 0"); + patternInputComp.setLayoutData("grow,wrap,spanx,hmin 0,wmin 0"); newPattern = new NewPattern(patternInputComp); patternList = new PatternList(patternInputComp); @@ -261,7 +261,7 @@ public class IncludeExcludeWindow { Group newPatternGroup = new Group(parent, SWT.SHADOW_ETCHED_IN); newPatternGroup.setLayoutData("grow,wrap"); - MigLayout newPatternLayout = new MigLayout("fill", "[grow][grow][60][60]", "[][]"); + MigLayout newPatternLayout = new MigLayout("fill", "[][grow][60][60]", "[][]"); newPatternGroup.setLayout(newPatternLayout); newPatternGroup.setText("New Pattern"); @@ -367,13 +367,13 @@ public class IncludeExcludeWindow private PatternList(Composite parent) { Group patternGroup = new Group(parent, SWT.SHADOW_ETCHED_IN); - patternGroup.setLayoutData("grow,hmin 0"); + patternGroup.setLayoutData("grow,hmin 0,wmin 0"); MigLayout patternLayout = new MigLayout("fill"); patternGroup.setLayout(patternLayout); patternGroup.setText("Patterns (Double click to Edit)"); - patternSet = new List(patternGroup, SWT.BORDER | SWT.V_SCROLL); - patternSet.setLayoutData("grow,hmin 0"); + patternSet = new List(patternGroup, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); + patternSet.setLayoutData("grow,hmin 0,wmin 0"); patternSet.addMouseListener(new org.eclipse.swt.events.MouseAdapter() {