JBoss Tools SVN: r24608 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-01 10:03:25 -0400 (Wed, 01 Sep 2010)
New Revision: 24608
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
JBIDE-6957
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-09-01 14:00:21 UTC (rev 24607)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2010-09-01 14:03:25 UTC (rev 24608)
@@ -140,7 +140,7 @@
}
protected IDecorator getDecorator(String path) {
- IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/decorators/definition/TimestampLogger.java");
+ IClassBean bean = getClassBean(path);
assertNotNull("Can't find the bean.", bean);
if(!(bean instanceof IDecorator)) {
fail("The bean is not a decorator.");
15 years, 1 month
JBoss Tools SVN: r24607 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-09-01 10:00:21 -0400 (Wed, 01 Sep 2010)
New Revision: 24607
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
Log:
JBIDE-6949: Auto code completion for EL doesn't work when a user types "."
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2010-09-01 13:33:42 UTC (rev 24606)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2010-09-01 14:00:21 UTC (rev 24607)
@@ -35,7 +35,10 @@
*/
@SuppressWarnings("restriction")
public class XMLTextViewerConfiguration extends StructuredTextViewerConfigurationXML {
-
+ private static final char[] PROPOSAL_AUTO_ACTIVATION_CHARS = new char[] {
+ '<', '=', '"', '\'', '.', '{'
+ };
+
SourceViewerConfiguration initial = null;
public XMLTextViewerConfiguration() {
@@ -62,6 +65,20 @@
return ProposalSorter.filterAndSortProposals(proposals, monitor, context);
}
+ @Override
+ public char[] getCompletionProposalAutoActivationCharacters() {
+ char[] superAutoActivationCharacters = super.getCompletionProposalAutoActivationCharacters();
+ if (superAutoActivationCharacters == null)
+ return PROPOSAL_AUTO_ACTIVATION_CHARS;
+
+ String chars = new String(superAutoActivationCharacters);
+ for (char ch : PROPOSAL_AUTO_ACTIVATION_CHARS) {
+ if (chars.indexOf(ch) == -1) {
+ chars += ch;
+ }
+ }
+ return chars.toCharArray();
+ }
};
List<IContentAssistProcessor> processors = new ArrayList<IContentAssistProcessor>();
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2010-09-01 13:33:42 UTC (rev 24606)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2010-09-01 14:00:21 UTC (rev 24607)
@@ -28,6 +28,7 @@
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
import org.eclipse.jface.text.information.IInformationProvider;
import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import org.eclipse.wst.html.core.text.IHTMLPartitions;
import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
@@ -48,6 +49,10 @@
StructuredTextViewerConfigurationHTML implements
ITextViewerConfiguration {
+ private static final char[] PROPOSAL_AUTO_ACTIVATION_CHARS = new char[] {
+ '<', '=', '"', '\'', '.', '{'
+ };
+
TextViewerConfigurationDelegate configurationDelegate;
private static final String TEMPLATES_CONTENT_ASSISTANT = "org.jboss.tools.jst.jsp.editorContentAssistent"; //$NON-NLS-1$
@@ -64,7 +69,6 @@
// sourceViewer, partitionType);
IContentAssistProcessor superProcessor = new HTMLStructuredContentAssistProcessor(
this.getContentAssistant(), partitionType, sourceViewer) {
-
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected List filterAndSortProposals(List proposals,
@@ -72,7 +76,21 @@
CompletionProposalInvocationContext context) {
return ProposalSorter.filterAndSortProposals(proposals, monitor, context);
}
-
+
+ @Override
+ public char[] getCompletionProposalAutoActivationCharacters() {
+ char[] superAutoActivationCharacters = super.getCompletionProposalAutoActivationCharacters();
+ if (superAutoActivationCharacters == null)
+ return PROPOSAL_AUTO_ACTIVATION_CHARS;
+
+ String chars = new String(superAutoActivationCharacters);
+ for (char ch : PROPOSAL_AUTO_ACTIVATION_CHARS) {
+ if (chars.indexOf(ch) == -1) {
+ chars += ch;
+ }
+ }
+ return chars.toCharArray();
+ }
};
List<IContentAssistProcessor> processors = new ArrayList<IContentAssistProcessor>();
processors.addAll(
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2010-09-01 13:33:42 UTC (rev 24606)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2010-09-01 14:00:21 UTC (rev 24607)
@@ -32,7 +32,10 @@
*/
@SuppressWarnings("restriction")
public class JSPTextViewerConfiguration extends StructuredTextViewerConfigurationJSP implements ITextViewerConfiguration {
-
+ private static final char[] PROPOSAL_AUTO_ACTIVATION_CHARS = new char[] {
+ '<', '=', '"', '\'', '.', '{'
+ };
+
private TextViewerConfigurationDelegate configurationDelegate;
public JSPTextViewerConfiguration() {
@@ -95,7 +98,21 @@
CompletionProposalInvocationContext context) {
return ProposalSorter.filterAndSortProposals(proposals, monitor, context);
}
-
+
+ @Override
+ public char[] getCompletionProposalAutoActivationCharacters() {
+ char[] superAutoActivationCharacters = super.getCompletionProposalAutoActivationCharacters();
+ if (superAutoActivationCharacters == null)
+ return PROPOSAL_AUTO_ACTIVATION_CHARS;
+
+ String chars = new String(superAutoActivationCharacters);
+ for (char ch : PROPOSAL_AUTO_ACTIVATION_CHARS) {
+ if (chars.indexOf(ch) == -1) {
+ chars += ch;
+ }
+ }
+ return chars.toCharArray();
+ }
};
List<IContentAssistProcessor> processors = new ArrayList<IContentAssistProcessor>();
15 years, 1 month
JBoss Tools SVN: r24606 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 09:33:42 -0400 (Wed, 01 Sep 2010)
New Revision: 24606
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java
Log:
[JBIDE-6880] changed camel case to _-separated words (maxs preference)
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-09-01 13:31:27 UTC (rev 24605)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/IUsageReportPreferenceConstants.java 2010-09-01 13:33:42 UTC (rev 24606)
@@ -22,13 +22,13 @@
* The identifier to be used to identify the value that determines if usage
* shall be reported.
*/
- public static final String USAGEREPORT_ENABLED_ID = "allowUsageReportPreference"; //$NON-NLS-1$
+ public static final String USAGEREPORT_ENABLED_ID = "allow_usage_report_preference"; //$NON-NLS-1$
/**
* The identifier to be used for the value that determines if the user shall
* be asked for reporting.
*/
- public static final String ASK_USER_USAGEREPORT_ID = "askUserForUsageReportPreference"; //$NON-NLS-1$
+ public static final String ASK_USER_USAGEREPORT_ID = "ask_user_for_usage_report_preference"; //$NON-NLS-1$
/**
* The identifier to be used for the value that determines this eclipse
15 years, 1 month
JBoss Tools SVN: r24605 - in trunk/usage/tests/org.jboss.tools.usage.test: src/org/jboss/tools/usage/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 09:31:27 -0400 (Wed, 01 Sep 2010)
New Revision: 24605
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java
Log:
[JBIDE-6880] Switching to properties file
Modified: trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch 2010-09-01 13:29:40 UTC (rev 24604)
+++ trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageReportingSettingsTest.launch 2010-09-01 13:31:27 UTC (rev 24605)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
@@ -12,6 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.ui.bot.ext,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,org.jboss.tools.common.verification.ui,org.jboss.tools.common.gef,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.tools.common.ui,org.jboss.tools.common.el.ui,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui,org.jboss.tools.tests,org.jboss.tools.common.model.test"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -36,10 +37,11 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.swt@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.help.base@default:default,org.eclipse.core.databinding.property@default:default,com.springsource.org.apache.commons.logging@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.jobs@default:default,org.apache.jasper@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.help.ui@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.databinding@default:default,com.springsource.javax.!
el@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.security@default:default,org.eclipse.text@default:default,org.eclipse.core.variables@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.app@default:default,org.eclipse.osgi.services@default:default,org.junit4@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.core.resources.compatibility@default:false,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.expressions@default:default,org.ec!
lipse.equinox.http.jetty@default:default,org.eclipse.jface@def!
ault:def
ault,org.eclipse.equinox.common@2:true,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.compare.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,javax.servlet@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.commands@default:default,org.apache.commons.el@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ui.views@default:default,com.ibm.icu@default:default,com.jboss.jbds.product@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.cocoa@default:false,org.eclipse.ant.core@default!
:default,org.eclipse.ui.intro.universal@default:default,org.apache.ant@default:default,org.eclipse.equinox.transforms.hook@default:false,org.hamcrest.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.help@default:default,com.springsource.javax.servlet@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,javax.transaction@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui@default:default,org.eclipse.ui.cheatsheets@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.jface.text@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.help@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ltk.ui.refactoring@default:default,com.ibm.icu@default:default,ch.qos.logback.classic@default:default,org.eclipse.ui.editors@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.junit4@default:default,javax.mail@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ui.intro@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.team.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse!
.swt@default:default,org.eclipse.equinox.common@2:true,org.eclipse.net4j.jms.api@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.expressions@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jface@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf@default:default,org.eclipse.update.configurator@default:default,org.eclipse.equinox.p2.repository@default:default,org.apache.jasper@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.metadata@default:default,org.mortbay.jetty.server@default:default,javax.servlet.jsp@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.ui@default:default,org.eclipse.equinox.htt!
p.servlet@default:default,org.eclipse.core.filesystem@default:!
default,
org.mortbay.jetty.util@default:default,org.eclipse.ui.ide@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ltk.core.refactoring@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.app@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.views@default:default,org.eclipse.team.core@default:default,javax.activation@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,javax.servlet@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.engine@default:default,org.slf4j.api@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.hamcrest.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.equinox.security.macosx@def!
ault:false,org.eclipse.ecf.identity@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf.ssl@default:false,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.osgi.services@default:default,org.eclipse.ui@default:default,org.eclipse.ui.forms@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding.property@default:default,ch.qos.logback.core@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.lucene@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.ant@default:default,org.eclipse.core.jobs@default:default,org.!
eclipse.ecf.provider.filetransfer@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<booleanAttribute key="useProduct" value="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-09-01 13:29:40 UTC (rev 24604)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageReportingSettingsTest.java 2010-09-01 13:31:27 UTC (rev 24605)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.usage.test;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -31,13 +30,13 @@
@Test
public void canExtractEnabledValue() throws IOException {
- GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("ENABLED", "", "");
+ GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("true", "", "");
assertTrue(reportSettings.isEnabled());
}
@Test
public void canExtractDisabledValue() throws IOException {
- GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("DISABLED", "", "");
+ GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("false", "", "");
assertFalse(reportSettings.isEnabled());
}
@@ -47,18 +46,6 @@
assertFalse(reportEnablement.isEnabled());
}
- @Test
- public void canExtractStringValue() throws IOException {
- GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("", "dummy", "");
- assertEquals("dummy", reportSettings.getStringValue());
- }
-
- @Test
- public void canExtractIntegerValue() throws IOException {
- GlobalReportingSettingsFake reportSettings = new GlobalReportingSettingsFake("", "", "42");
- assertEquals(Integer.valueOf(42), reportSettings.getIntegerValue());
- }
-
private class GlobalReportingSettingsFake extends GlobalUsageReportingSettings {
private String enablementValue;
@@ -74,7 +61,7 @@
}
@Override
- protected InputStreamReader request(HttpURLConnection urlConnection) throws UnsupportedEncodingException {
+ protected InputStreamReader request(HttpURLConnection urlConnection) throws UnsupportedEncodingException {
return new InputStreamReader(new ByteArrayInputStream(getEnablementPageContent(enablementValue,
stringValue, integerValue).getBytes()), "UTF-8");
}
@@ -82,122 +69,13 @@
private String getEnablementPageContent(String enablementValue, String dummyValue, String integerValue) {
- return
-// "Dummy Value would be cool but here follows the Boolean Value for the Report Enablement: "
-// + "<h1>" + GlobalUsageReportingSettings.KEY_REPORT_ENABLEMENT
-// + enablementValue
-// + "</h1>"
-//
-// + "The Dummy Value in this Resource is set to "
-// + "<h1>" + GlobalUsageReportingSettings.KEY_DUMMY_VALUE
-// + dummyValue
-// + "</h1>"
-//
-// + "Boolean Usage Reporting is set to:"
-// + "<h1>" + GlobalUsageReportingSettings.KEY_REPORT_ENABLEMENT
-// + enablementValue
-// + "</h1>"
-//
-// + "And the value of type Integer is "
-// + "<h1>" + GlobalUsageReportingSettings.KEY_INTEGER_VALUE
-// + integerValue
-// + "</h1>"
-// + " is the Value that is a String";
- "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\""
- + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\"> "
- + " "
- + " "
- +
- "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\"> "
- + "<head> "
- +
- " <title> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement - JBoss Community</title> "
- + " "
- +
- " <meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\" /> "
- + " "
- + " <script type=\"text/javascript\"> "
- + " var javascriptIsCool = false;"
- + " </script> "
- + " "
- + "</head> "
- + "<body class=\"jive-body-content jive-body-content-document\" > "
- + " <div id=\"jive-body\"> "
- + " "
- + "<div class=\"jive-content\"> "
- + " <div class=\"jive-content-header\"> "
- +
- " <div class=\"jive-wiki-post-moderating jive-content-header-moderating\"> "
- +
- " <span class=\"jive-icon-med jive-icon-moderation\"></span>Currently Being Moderated"
- + " </div> "
- + " <div class=\"jive-content-title\"> "
- +
- " <h2><span class=\"jive-icon-big jive-icon-document\"></span> JBoss Tools / JBoss Developer Studio Usage Reporting Enablement</h2> "
- + " </div> "
- + " <div class=\"jive-content-header-version\"> "
- + " VERSION 5 "
- +
- " <a href=\"/wiki/JBossToolsJBossDeveloperStudioUsageReportingEnablement/diff?secondVersionNumber=5\" title=\"Click to view article history\"><img class=\"jive-icon-sml jive-icon-search\" src=\"/4.0.5/images/transparent.png\" alt=\"Click to view article history\" /></a> "
- + " </div> "
- + " <div class=\"jive-content-header-details\"> "
- + " "
- + "Created on: Aug 24, 2010 5:39 AM by"
- + "<a href=\"/people/adietish\""
- + "id=\"jive-72036899,987,346,482,238\""
- + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
- + "onmouseout=\"quickuserprofile.cancelTooltip();\""
- + "class=\"jiveTT-hover-user jive-username-link\""
- + ">Andre Dietisheim</a> <span>-</span> "
- + "Last Modified: "
- + "Aug 24, 2010 5:53 AM"
- + "by <a href=\"/people/adietish\""
- + "id=\"jive-72036899,987,347,353,238\""
- + "onmouseover=\"quickuserprofile.getUserProfileTooltip(72036);\""
- + "onmouseout=\"quickuserprofile.cancelTooltip();\""
- + "class=\"jiveTT-hover-user jive-username-link\""
- + ">Andre Dietisheim</a> </div> "
- + " "
- + " </div> "
- + " <div class=\"jive-content-body\"> "
- + " "
- +
- "<!-- [DocumentBodyStart:e26c60c0-cb73-47b7-bded-f4eb7320305b] --><div class=\"jive-rendered-content\"><p>This article is queried by the JBoss Tools / JBoss Developer Studio usage reporting plugin. It implements a global kill-switch that allows us to disable usage reporting stats. The plugin looks for a string of the format:</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><p><strong>Usage  Reporting  is <"
- +
- "ENABLED></strong>. Any value that differs from ENABLED is interpreted as DISABLED.</p><p style=\"min-height: 8pt; height: 8pt; padding: 0px;\"> </p><h1>Usage Reporting is "
-
- + enablementValue
-
- + "</h1>"
- + "<h1>Dummy Value is "
-
- + dummyValue
-
- + "</h1>"
-
- + "<h1>Integer Value is "
-
- + integerValue
-
- + "</h1>"
-
- +
- "</div><!-- [DocumentBodyEnd:e26c60c0-cb73-47b7-bded-f4eb7320305b] --> "
- + " "
- + " </div> "
- + " <div class=\"jive-content-footer\"> "
- + " "
- + " "
- + " <!-- BEGIN content details --> "
- + " <span class=\"jive-content-footer-item\"> "
- + " 18 Views</a> "
- + " </span> "
- + " "
- + " "
- + " </div> "
- + "</div> "
- + "</body> "
- + "</html> ";
+ return "some rubbish at the beginning..."
+ + GlobalUsageReportingSettings.REPORT_ENABLEMENT_KEY
+ + enablementValue
+ + "\n"
+ + "#"
+ + "some rubbish at the end";
+
}
@Test
15 years, 1 month
JBoss Tools SVN: r24604 - in trunk/usage/plugins/org.jboss.tools.usage: src/org/jboss/tools/usage/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 09:29:40 -0400 (Wed, 01 Sep 2010)
New Revision: 24604
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java
Log:
[JBIDE-6880] Switching to properties file
Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-01 13:27:21 UTC (rev 24603)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-01 13:29:40 UTC (rev 24604)
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/>
<booleanAttribute key="default" value="true"/>
@@ -18,7 +18,7 @@
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="pde.generated.config" value="false"/>
@@ -27,9 +27,10 @@
<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.preferences@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.databinding.observable@default:default,org.mortbay.jetty.util@default:default,org.eclipse.help.ui@default:default,org.apache.ant@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.core.resources.compatibility@default:false,org.apache.jasper@default:default,!
org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.runtime@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jface@default:default,org.junit4@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.databinding.property@default:default,javax.servlet@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.text@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.help.base@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.el@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:fals!
e,org.eclipse.equinox.app@default:default,org.eclipse.equinox.!
p2.engin
e@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.help@default:default,org.mortbay.jetty.server@default:default,com.jboss.jbds.product@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.cocoa@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.transforms.hook@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.swt@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.hamcrest.core@default:default,org.eclipse.ui.intro@default!
:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf@default:default,org.apache.commons.el@default:default,org.eclipse.compare.core@default:default,javax.transaction@default:false,org.eclipse.core.expressions@default:default,com.springsource.javax.servlet.jsp@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.net@default:default,org.apache.lucene@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ecf.ssl@default:false"/>
<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${workspace_loc:org.jboss.tools.usage/config.ini}"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfig" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<booleanAttribute key="useProduct" value="true"/>
<booleanAttribute key="usefeatures" value="false"/>
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-01 13:27:21 UTC (rev 24603)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-01 13:29:40 UTC (rev 24604)
@@ -24,7 +24,7 @@
private static final String REPORTING_ENABLEMENT_URL = "http://anonsvn.jboss.org/repos/jbosstools/workspace/usage/usage.properties"; //$NON-NLS-1$
- public static final String REPORT_ENABLEMENT_KEY = "usageReportingEnabled "; //$NON-NLS-1$
+ public static final String REPORT_ENABLEMENT_KEY = "usage_reporting_enabled="; //$NON-NLS-1$
private static final boolean REPORT_ENABLEMENT_DEFAULT = false;
/* the delimiter that delimits the value */
15 years, 1 month
JBoss Tools SVN: r24603 - workspace/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 09:27:21 -0400 (Wed, 01 Sep 2010)
New Revision: 24603
Modified:
workspace/usage/usage.properties
Log:
[JBIDE-6880] switching to properties file
Modified: workspace/usage/usage.properties
===================================================================
--- workspace/usage/usage.properties 2010-09-01 13:16:56 UTC (rev 24602)
+++ workspace/usage/usage.properties 2010-09-01 13:27:21 UTC (rev 24603)
@@ -1,2 +1,2 @@
-usageReportingEnabled=true
+usage_reporting_enabled=true
#
15 years, 1 month
JBoss Tools SVN: r24602 - workspace/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 09:16:56 -0400 (Wed, 01 Sep 2010)
New Revision: 24602
Modified:
workspace/usage/usage.properties
Log:
[JBIDE-6880] switching to properties file
Modified: workspace/usage/usage.properties
===================================================================
--- workspace/usage/usage.properties 2010-09-01 13:11:11 UTC (rev 24601)
+++ workspace/usage/usage.properties 2010-09-01 13:16:56 UTC (rev 24602)
@@ -0,0 +1,2 @@
+usageReportingEnabled=true
+#
15 years, 1 month
JBoss Tools SVN: r24601 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 09:11:11 -0400 (Wed, 01 Sep 2010)
New Revision: 24601
Added:
workspace/usage.properties
Log:
[JBIDE-6880] switching to properties file
Added: workspace/usage.properties
===================================================================
--- workspace/usage.properties (rev 0)
+++ workspace/usage.properties 2010-09-01 13:11:11 UTC (rev 24601)
@@ -0,0 +1,2 @@
+usageReportingEnabled=true
+#
15 years, 1 month
JBoss Tools SVN: r24600 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 08:54:21 -0400 (Wed, 01 Sep 2010)
New Revision: 24600
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java
Log:
[JBIDE-6880] Switching to properties file
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-01 12:53:33 UTC (rev 24599)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-01 12:54:21 UTC (rev 24600)
@@ -28,7 +28,7 @@
private static final boolean REPORT_ENABLEMENT_DEFAULT = false;
/* the delimiter that delimits the value */
- private static final char VALUE_DELIMITER = '=';
+ private static final char VALUE_DELIMITER = '\n';
public GlobalUsageReportingSettings(Plugin plugin) {
super(REPORTING_ENABLEMENT_URL
15 years, 1 month
JBoss Tools SVN: r24599 - trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-01 08:53:33 -0400 (Wed, 01 Sep 2010)
New Revision: 24599
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java
Log:
[JBIDE-6880] Switching to properties file
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-01 12:47:02 UTC (rev 24598)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageReportingSettings.java 2010-09-01 12:53:33 UTC (rev 24599)
@@ -22,26 +22,19 @@
*/
public class GlobalUsageReportingSettings extends HttpResourceMap {
- private static final String REPORT_ENABLEMENT_ENABLEDVALUE = "ENABLED"; //$NON-NLS-1$
+ private static final String REPORTING_ENABLEMENT_URL = "http://anonsvn.jboss.org/repos/jbosstools/workspace/usage/usage.properties"; //$NON-NLS-1$
- private static final String REPORTING_ENABLEMENT_URL = "http://community.jboss.org/wiki/JBossToolsJBossDeveloperStudioUsageReport..."; //$NON-NLS-1$
+ public static final String REPORT_ENABLEMENT_KEY = "usageReportingEnabled "; //$NON-NLS-1$
+ private static final boolean REPORT_ENABLEMENT_DEFAULT = false;
- public static final String REPORT_ENABLEMENT_KEY = "Usage Reporting is "; //$NON-NLS-1$
- private static final boolean REPORT_ENABLEMENT_DEFAULT = true;
-
- public static final String DUMMY_VALUE_KEY = "Dummy Value is "; //$NON-NLS-1$
- public static final String INTEGER_VALUE_KEY = "Integer Value is "; //$NON-NLS-1$
-
/* the delimiter that delimits the value */
- private static final char VALUE_DELIMITER = '<';
+ private static final char VALUE_DELIMITER = '=';
public GlobalUsageReportingSettings(Plugin plugin) {
super(REPORTING_ENABLEMENT_URL
, VALUE_DELIMITER
, plugin
- , REPORT_ENABLEMENT_KEY
- , DUMMY_VALUE_KEY
- , INTEGER_VALUE_KEY);
+ , REPORT_ENABLEMENT_KEY);
this.plugin = plugin;
}
@@ -50,31 +43,9 @@
try {
Map<String, String> valueMap = getValueMap();
String isEnabled = valueMap.get(REPORT_ENABLEMENT_KEY);
- return isEnabled != null && REPORT_ENABLEMENT_ENABLEDVALUE.equals(isEnabled.toUpperCase());
+ return Boolean.valueOf(isEnabled);
} catch (Exception e) {
return REPORT_ENABLEMENT_DEFAULT;
}
}
-
- public String getStringValue() {
- try {
- Map<String, String> valueMap = getValueMap();
- return valueMap.get(DUMMY_VALUE_KEY);
- } catch (Exception e) {
- return "";
- }
- }
-
- public Integer getIntegerValue() {
- Integer returnValue = null;
- try {
- Map<String, String> valueMap = getValueMap();
- String integerValue = valueMap.get(INTEGER_VALUE_KEY);
- if (integerValue != null) {
- returnValue = Integer.parseInt(integerValue);
- }
- } catch (Exception e) {
- }
- return returnValue;
- }
}
15 years, 1 month