JBoss Tools SVN: r24952 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-09-15 17:54:05 -0400 (Wed, 15 Sep 2010)
New Revision: 24952
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
Log:
JBIDE-7073
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2010-09-15 20:38:58 UTC (rev 24951)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2010-09-15 21:54:05 UTC (rev 24952)
@@ -323,7 +323,6 @@
if (window == null) {
Display.getDefault().syncExec(new Runnable() {
- @Override
public void run() {
IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
switchPerspective(perspectiveId, finalPersp, win);
15 years, 7 months
JBoss Tools SVN: r24951 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-09-15 16:38:58 -0400 (Wed, 15 Sep 2010)
New Revision: 24951
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
Log:
JBIDE-7073 Project Examples Should Provide The Option To Switch To A Specified Perspective
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2010-09-15 16:54:36 UTC (rev 24950)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/Project.java 2010-09-15 20:38:58 UTC (rev 24951)
@@ -33,14 +33,15 @@
private String site;
private List<ProjectFix> fixes = new ArrayList<ProjectFix>();
private List<ProjectFix> unsatisfiedFixes;
+ private String perspectiveId;
-
public Project() {
name=""; //$NON-NLS-1$
shortDescription=""; //$NON-NLS-1$
description=""; //$NON-NLS-1$
url=""; //$NON-NLS-1$
welcome=false;
+ perspectiveId = null;
setCategory(Category.OTHER);
}
@@ -171,4 +172,12 @@
public void setUnsatisfiedFixes(List<ProjectFix> unsatisfiedFixes) {
this.unsatisfiedFixes = unsatisfiedFixes;
}
+
+ public String getPerspectiveId() {
+ return perspectiveId;
+ }
+
+ public void setPerspectiveId(String perspectiveId) {
+ this.perspectiveId = perspectiveId;
+ }
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2010-09-15 16:54:36 UTC (rev 24950)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2010-09-15 20:38:58 UTC (rev 24951)
@@ -282,6 +282,9 @@
if (nodeName.equals(URL)) {
project.setUrl(getContent(child));
}
+ if (nodeName.equals("perspectiveId")) { //$NON-NLS-1$
+ project.setPerspectiveId(getContent(child));
+ }
if (nodeName.equals("size")) { //$NON-NLS-1$
long size = 0;
try {
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2010-09-15 16:54:36 UTC (rev 24950)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2010-09-15 20:38:58 UTC (rev 24951)
@@ -21,8 +21,10 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
@@ -49,8 +51,11 @@
import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.jdt.internal.core.OpenableElementInfo;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -58,19 +63,36 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IPerspectiveDescriptor;
+import org.eclipse.ui.IPerspectiveRegistry;
+import org.eclipse.ui.IPluginContribution;
import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPreferenceConstants;
+import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.WorkbenchException;
+import org.eclipse.ui.activities.IActivityManager;
+import org.eclipse.ui.activities.IIdentifier;
+import org.eclipse.ui.activities.IWorkbenchActivitySupport;
+import org.eclipse.ui.activities.WorkbenchActivityHelper;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.internal.IPreferenceConstants;
+import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.cheatsheets.state.DefaultStateManager;
import org.eclipse.ui.internal.cheatsheets.views.CheatSheetView;
import org.eclipse.ui.internal.cheatsheets.views.ViewUtilities;
+import org.eclipse.ui.internal.ide.IDEInternalPreferences;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.util.PrefUtil;
import org.eclipse.ui.internal.wizards.datatransfer.ZipLeveledStructureProvider;
+import org.eclipse.ui.internal.wizards.newresource.ResourceMessages;
import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
import org.jboss.tools.project.examples.Messages;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
import org.jboss.tools.project.examples.dialog.MarkerDialog;
@@ -196,6 +218,7 @@
public void done(IJobChangeEvent event) {
try {
+ updatePerspective();
ProjectExamplesActivator.waitForBuildAndValidation
.schedule();
ProjectExamplesActivator.waitForBuildAndValidation
@@ -238,6 +261,203 @@
return true;
}
+ protected void updatePerspective() {
+ if (projects == null || projects.size() != 1) {
+ return;
+ }
+ final String perspectiveId = projects.get(0).getPerspectiveId();
+ if (perspectiveId == null || perspectiveId.length() <= 0) {
+ return;
+ }
+ // Retrieve the new project open perspective preference setting
+ String perspSetting = PrefUtil.getAPIPreferenceStore().getString(
+ IDE.Preferences.PROJECT_OPEN_NEW_PERSPECTIVE);
+
+ String promptSetting = IDEWorkbenchPlugin.getDefault()
+ .getPreferenceStore().getString(
+ IDEInternalPreferences.PROJECT_SWITCH_PERSP_MODE);
+
+ // Return if do not switch perspective setting and are not prompting
+ if (!(promptSetting.equals(MessageDialogWithToggle.PROMPT))
+ && perspSetting.equals(IWorkbenchPreferenceConstants.NO_NEW_PERSPECTIVE)) {
+ return;
+ }
+
+ // Map perspective id to descriptor.
+ IPerspectiveRegistry reg = PlatformUI.getWorkbench()
+ .getPerspectiveRegistry();
+
+ // leave this code in - the perspective of a given project may map to
+ // activities other than those that the wizard itself maps to.
+ final IPerspectiveDescriptor finalPersp = reg
+ .findPerspectiveWithId(perspectiveId);
+ if (finalPersp != null && finalPersp instanceof IPluginContribution) {
+ IPluginContribution contribution = (IPluginContribution) finalPersp;
+ if (contribution.getPluginId() != null) {
+ IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI
+ .getWorkbench().getActivitySupport();
+ IActivityManager activityManager = workbenchActivitySupport
+ .getActivityManager();
+ IIdentifier identifier = activityManager
+ .getIdentifier(WorkbenchActivityHelper
+ .createUnifiedId(contribution));
+ Set idActivities = identifier.getActivityIds();
+
+ if (!idActivities.isEmpty()) {
+ Set enabledIds = new HashSet(activityManager
+ .getEnabledActivityIds());
+
+ if (enabledIds.addAll(idActivities)) {
+ workbenchActivitySupport
+ .setEnabledActivityIds(enabledIds);
+ }
+ }
+ }
+ } else {
+ IDEWorkbenchPlugin.log("Unable to find perspective " //$NON-NLS-1$
+ + perspectiveId
+ + " in NewProjectExamplesWizard.updatePerspective"); //$NON-NLS-1$
+ return;
+ }
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (window == null) {
+ Display.getDefault().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ switchPerspective(perspectiveId, finalPersp, win);
+ }
+ });
+ } else {
+ switchPerspective(perspectiveId, finalPersp, window);
+ }
+ }
+
+ private void switchPerspective(String perspectiveId,
+ IPerspectiveDescriptor finalPersp, IWorkbenchWindow window) {
+ if (window != null) {
+ IWorkbenchPage page = window.getActivePage();
+ if (page != null) {
+ IPerspectiveDescriptor currentPersp = page.getPerspective();
+ if (currentPersp != null
+ && perspectiveId.equals(currentPersp.getId())) {
+ return;
+ }
+ }
+ }
+
+ if (!confirmPerspectiveSwitch(window, finalPersp)) {
+ return;
+ }
+
+ int workbenchPerspectiveSetting = WorkbenchPlugin.getDefault().getPreferenceStore().getInt(IPreferenceConstants.OPEN_PERSP_MODE);
+
+ if (workbenchPerspectiveSetting == IPreferenceConstants.OPM_NEW_WINDOW) {
+ openInNewWindow(finalPersp);
+ return;
+ }
+
+ replaceCurrentPerspective(finalPersp);
+ }
+
+ /**
+ * Prompts the user for whether to switch perspectives.
+ *
+ * @param window
+ * The workbench window in which to switch perspectives; must not
+ * be <code>null</code>
+ * @param finalPersp
+ * The perspective to switch to; must not be <code>null</code>.
+ *
+ * @return <code>true</code> if it's OK to switch, <code>false</code>
+ * otherwise
+ */
+ private static boolean confirmPerspectiveSwitch(IWorkbenchWindow window,
+ IPerspectiveDescriptor finalPersp) {
+ IPreferenceStore store = IDEWorkbenchPlugin.getDefault()
+ .getPreferenceStore();
+ String pspm = store
+ .getString(IDEInternalPreferences.PROJECT_SWITCH_PERSP_MODE);
+ if (!IDEInternalPreferences.PSPM_PROMPT.equals(pspm)) {
+ // Return whether or not we should always switch
+ return IDEInternalPreferences.PSPM_ALWAYS.equals(pspm);
+ }
+ String desc = finalPersp.getDescription();
+ String message;
+ if (desc == null || desc.length() == 0)
+ message = NLS.bind(ResourceMessages.NewProject_perspSwitchMessage,
+ finalPersp.getLabel());
+ else
+ message = NLS.bind(
+ ResourceMessages.NewProject_perspSwitchMessageWithDesc,
+ new String[] { finalPersp.getLabel(), desc });
+
+ MessageDialogWithToggle dialog = MessageDialogWithToggle
+ .openYesNoQuestion(window.getShell(),
+ ResourceMessages.NewProject_perspSwitchTitle, message,
+ null /* use the default message for the toggle */,
+ false /* toggle is initially unchecked */, store,
+ IDEInternalPreferences.PROJECT_SWITCH_PERSP_MODE);
+ int result = dialog.getReturnCode();
+
+ // If we are not going to prompt anymore propogate the choice.
+ if (dialog.getToggleState()) {
+ String preferenceValue;
+ if (result == IDialogConstants.YES_ID) {
+ // Doesn't matter if it is replace or new window
+ // as we are going to use the open perspective setting
+ preferenceValue = IWorkbenchPreferenceConstants.OPEN_PERSPECTIVE_REPLACE;
+ } else {
+ preferenceValue = IWorkbenchPreferenceConstants.NO_NEW_PERSPECTIVE;
+ }
+
+ // update PROJECT_OPEN_NEW_PERSPECTIVE to correspond
+ PrefUtil.getAPIPreferenceStore().setValue(
+ IDE.Preferences.PROJECT_OPEN_NEW_PERSPECTIVE,
+ preferenceValue);
+ }
+ return result == IDialogConstants.YES_ID;
+ }
+
+ /*
+ * (non-Javadoc) Opens a new window with a particular perspective and input.
+ */
+ private static void openInNewWindow(IPerspectiveDescriptor desc) {
+
+ // Open the page.
+ try {
+ PlatformUI.getWorkbench().openWorkbenchWindow(desc.getId(),
+ ResourcesPlugin.getWorkspace().getRoot());
+ } catch (WorkbenchException e) {
+ IWorkbenchWindow window = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow();
+ if (window != null) {
+ ErrorDialog.openError(window.getShell(), ResourceMessages.NewProject_errorOpeningWindow,
+ e.getMessage(), e.getStatus());
+ }
+ }
+ }
+
+ /*
+ * (non-Javadoc) Replaces the current perspective with the new one.
+ */
+ private static void replaceCurrentPerspective(IPerspectiveDescriptor persp) {
+
+ // Get the active page.
+ IWorkbenchWindow window = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow();
+ if (window == null) {
+ return;
+ }
+ IWorkbenchPage page = window.getActivePage();
+ if (page == null) {
+ return;
+ }
+
+ // Set the perspective.
+ page.setPerspective(persp);
+ }
private void openWelcome() {
for(final Project project:projects) {
if (project.isWelcome()) {
@@ -483,4 +703,5 @@
}
}
}
+
}
15 years, 7 months
JBoss Tools SVN: r24950 - workspace/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-15 12:54:36 -0400 (Wed, 15 Sep 2010)
New Revision: 24950
Modified:
workspace/usage/usage.properties
Log:
[JBIDE-6953] global kill-switch enabled again (reporting is enabled)
Modified: workspace/usage/usage.properties
===================================================================
--- workspace/usage/usage.properties 2010-09-15 16:46:30 UTC (rev 24949)
+++ workspace/usage/usage.properties 2010-09-15 16:54:36 UTC (rev 24950)
@@ -1,2 +1,2 @@
-usage_reporting_enabled=false
+usage_reporting_enabled=true
#
15 years, 7 months
JBoss Tools SVN: r24949 - workspace/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-15 12:46:30 -0400 (Wed, 15 Sep 2010)
New Revision: 24949
Modified:
workspace/usage/usage.properties
Log:
[JBIDE-6953] type in remote usage.properties fixed
Modified: workspace/usage/usage.properties
===================================================================
--- workspace/usage/usage.properties 2010-09-15 16:40:43 UTC (rev 24948)
+++ workspace/usage/usage.properties 2010-09-15 16:46:30 UTC (rev 24949)
@@ -1,2 +1,2 @@
-usage_reportings_enabled=false
+usage_reporting_enabled=false
#
15 years, 7 months
JBoss Tools SVN: r24948 - workspace/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-15 12:40:43 -0400 (Wed, 15 Sep 2010)
New Revision: 24948
Modified:
workspace/usage/usage.properties
Log:
[JBIDE-6953] testing with global kill-switch set to disabled
Modified: workspace/usage/usage.properties
===================================================================
--- workspace/usage/usage.properties 2010-09-15 16:39:23 UTC (rev 24947)
+++ workspace/usage/usage.properties 2010-09-15 16:40:43 UTC (rev 24948)
@@ -1,2 +1,2 @@
-usage_reportings_enabled=true
+usage_reportings_enabled=false
#
15 years, 7 months
JBoss Tools SVN: r24947 - trunk/usage/plugins/org.jboss.tools.usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-15 12:39:23 -0400 (Wed, 15 Sep 2010)
New Revision: 24947
Modified:
trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch
Log:
[JBIDE-6953] added sys property to launcher
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-15 16:37:08 UTC (rev 24946)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-15 16:39:23 UTC (rev 24947)
@@ -22,7 +22,7 @@
<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 -pluginCustomization ${workspace_loc}/../runtime-EclipseApplication/usage.properties -debug"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dusage_reporting_enabled=false"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-D__usage_reporting_enabled=false"/>
<booleanAttribute key="pde.generated.config" value="false"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
15 years, 7 months
JBoss Tools SVN: r24946 - in trunk/usage: plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-15 12:37:08 -0400 (Wed, 15 Sep 2010)
New Revision: 24946
Added:
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java
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/GlobalUsageSettings.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch
trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
Log:
[JBIDE-6953] renamed key to be identical in sys properties and in the remote properties (global kill-switch), separated tests for GlobalUsageSettings/HttpRemoteProperties, unified enablement query (no separate checks for local and remote enablement)
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-15 16:35:19 UTC (rev 24945)
+++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-09-15 16:37:08 UTC (rev 24946)
@@ -7,7 +7,7 @@
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
+<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"/>
@@ -22,6 +22,7 @@
<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 -pluginCustomization ${workspace_loc}/../runtime-EclipseApplication/usage.properties -debug"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dusage_reporting_enabled=false"/>
<booleanAttribute key="pde.generated.config" value="false"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java 2010-09-15 16:35:19 UTC (rev 24945)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/preferences/GlobalUsageSettings.java 2010-09-15 16:37:08 UTC (rev 24946)
@@ -26,21 +26,19 @@
private static final String REMOTEPROPS_URL = "http://anonsvn.jboss.org/repos/jbosstools/workspace/usage/usage.properties"; //$NON-NLS-1$
- public static final String REMOTEPROPS_ALLINSTANCES_ENABLED_KEY = "usage_allinstances_enabled="; //$NON-NLS-1$
-
- private static final boolean REMOTEPROPS_ALLINSTANCES_ENABLED_DEFAULT = false;
-
- /** the delimiter that delimits the key/value-pairs */
- private static final char VALUE_DELIMITER = '\n';
-
/**
* system property that enables/disables reporting for current eclipse
* instance
*/
- public static final String SYSPROPS_INSTANCE_ENABLED_KEY = "usage_instance_enabled"; //$NON-NLS-1$
+ public static final String USAGE_REPORTING_ENABLED_KEY = "usage_reporting_enabled"; //$NON-NLS-1$
- private static final boolean SYSPROPS_INSTANCE_ENABLED_KEY_DEFAULT = true;
+ public static final String REMOTEPROPS_USAGE_REPORTING_ENABLED_KEY = USAGE_REPORTING_ENABLED_KEY + "="; //$NON-NLS-1$
+ private static final boolean USAGE_REPORTING_ENABLED_DEFAULT = true;
+
+ /** the delimiter that delimits the key/value-pairs */
+ private static final char VALUE_DELIMITER = '\n';
+
private HttpRemotePropertiesProvider remoteMap;
public GlobalUsageSettings(Plugin plugin) {
@@ -48,31 +46,53 @@
REMOTEPROPS_URL
, VALUE_DELIMITER
, plugin
- , REMOTEPROPS_ALLINSTANCES_ENABLED_KEY);
+ , REMOTEPROPS_USAGE_REPORTING_ENABLED_KEY);
}
/**
- * Returns <code>true</code> if reporting is enabled for all instances
+ * Returns <code>true</code> if usage reporting is turned on.
*
+ * @return true, if is reporting enabled
+ */
+ public boolean isReportingEnabled() {
+ return isInstanceReportingEnabled() && isAllInstancesReportingEnabled();
+ }
+
+ /**
+ * Returns <code>true</code> if reporting is enabled for all instances. The
+ * appropriate setting is queried in a remote properties file at {@link #REMOTEPROPS_URL}. The key is {@link #REMOTEPROPS_ALLINSTANCES_ENABLED_DEFAULT}
+ *
* @return <code>true, if the remote peer is set to enabled
*
* @see #REMOTEPROPS_URL
* @see #REMOTEPROPS_ALLINSTANCES_ENABLED_KEY
*/
- public boolean isAllInstancesReportingEnabled() {
+ private boolean isAllInstancesReportingEnabled() {
try {
Map<String, String> valueMap = remoteMap.getValueMap();
- String isEnabled = valueMap.get(REMOTEPROPS_ALLINSTANCES_ENABLED_KEY);
+ String isEnabled = valueMap.get(REMOTEPROPS_USAGE_REPORTING_ENABLED_KEY);
+ if (isEnabled == null) {
+ return USAGE_REPORTING_ENABLED_DEFAULT;
+ }
+
return Boolean.valueOf(isEnabled);
} catch (Exception e) {
- return REMOTEPROPS_ALLINSTANCES_ENABLED_DEFAULT;
+ return USAGE_REPORTING_ENABLED_DEFAULT;
}
}
- public boolean isInstanceReportingEnabled() {
+ /**
+ * Returns <code>true</code> if is reporting is enabled for this eclipse
+ * instance.
+ *
+ * @return true, if this instance shall report usage
+ *
+ * @see #SYSPROPS_INSTANCE_ENABLED_KEY
+ */
+ private boolean isInstanceReportingEnabled() {
return Boolean.valueOf(
- System.getProperty(SYSPROPS_INSTANCE_ENABLED_KEY,
- String.valueOf(SYSPROPS_INSTANCE_ENABLED_KEY_DEFAULT)));
+ System.getProperty(USAGE_REPORTING_ENABLED_KEY,
+ String.valueOf(USAGE_REPORTING_ENABLED_DEFAULT)));
}
protected HttpRemotePropertiesProvider createRemoteMap(String url, char valueDelimiter, Plugin plugin,
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 16:35:19 UTC (rev 24945)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-09-15 16:37:08 UTC (rev 24946)
@@ -106,8 +106,7 @@
return Status.CANCEL_STATUS;
}
monitor.beginTask(ReportingMessages.UsageReport_Querying_Enablement, 2);
- if (globalSettings.isInstanceReportingEnabled()
- && globalSettings.isAllInstancesReportingEnabled()) {
+ if (globalSettings.isReportingEnabled()) {
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
Modified: trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch 2010-09-15 16:35:19 UTC (rev 24945)
+++ trunk/usage/tests/org.jboss.tools.usage.test/GlobalUsageSettingsTest.launch 2010-09-15 16:37:08 UTC (rev 24946)
@@ -12,7 +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"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.core,org.jboss.tools.gwt.ui,org.jboss.tools.common"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -22,8 +22,8 @@
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
@@ -37,8 +37,8 @@
<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.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@3:true,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.http.servlet!
@default:default,org.eclipse.core.filesystem@default:default,o!
rg.mortb
ay.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@default:fals!
e,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.e!
cf.provider.filetransfer@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.intro.universal@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.net4j.jms.api@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,javax.mail@default:default,org.junit4@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.help.base@default:default,org.eclipse.compare@default:default,org.eclipse.osgi@-1:true,org.eclipse.ecf.ssl@default:false,org.eclipse.core.databinding@default:default,org.eclipse.equinox.app@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jface@default:default,org.eclipse.ui.editors@default:default,org.eclipse.text@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.jasper@default:default,ch.qos.logback.slf4j@default:false,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,o!
rg.eclipse.core.filesystem@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.team.core@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.help.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.contenttype@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.slf4j.api@default:default,org.apache.commons.el@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.cocoa.macosx.x86_64@default:false,ch.qos.logback.classic@default:default,org.eclipse.core.runtime@default:true,ch.qos.logback.core@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.ecf@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui@default:default,org.eclipse.ui.forms@default:default,org.!
eclipse.ui.ide@default:default,org.eclipse.swtbot.ant.optional!
.junit4@
default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,javax.activation@default:default,org.eclipse.compare.core@default:default,com.ibm.icu@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.expressions@default:default,org.hamcrest.core@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.engine@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.navigato!
r@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.registry@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jface.databinding@default:default,javax.servlet.jsp@default:default,org.apache.lucene@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.team.ui@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.variables@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.apache.ant@default:default,org.eclipse.core.jobs@default:default,org.mortbay.jetty.server@default:default,org.eclipse.help@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility@defau!
lt:default,javax.servlet@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.jboss.tools.usage@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"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-15 16:35:19 UTC (rev 24945)
+++ trunk/usage/tests/org.jboss.tools.usage.test/UsageTestSuite.launch 2010-09-15 16:37:08 UTC (rev 24946)
@@ -12,7 +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.gwt.ui,org.jboss.tools.gwt.core"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.core,org.jboss.tools.gwt.ui"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -37,8 +37,8 @@
<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.osgi.services@default:default,org.eclipse.core.commands@default:default,javax.servlet@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.registry@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.observable@default:default,org.junit4@default:default,org.eclipse.ui.workbench@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jface@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface.databinding@default:default,org.hamcrest.core@default:default,org.eclipse.ui@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.!
runtime.compatibility.auth@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.core.databinding@default:default,com.ibm.icu@default:default,org.eclipse.help@default:default,org.eclipse.core.databinding.property@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.xulrunner.initializer@default:false"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.help@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jface@default:default,org.eclipse.core.runtime@default:true,com.ibm.icu@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.osgi@-1:true,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.ui.cocoa@default:false,javax.servlet@default:default,org.hamcrest.core@default:default,org.eclipse!
.swt.cocoa.macosx.x86_64@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.common@2:true,org.eclipse.core.commands@default:default,org.junit4@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.app@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.xulrunner.initializer@default:false"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java 2010-09-15 16:35:19 UTC (rev 24945)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/GlobalUsageSettingsTest.java 2010-09-15 16:37:08 UTC (rev 24946)
@@ -30,56 +30,81 @@
*/
public class GlobalUsageSettingsTest {
+ /**
+ * <ul>
+ * <li>sys prop: <code>not set</code></li>
+ * <li>remote prop: <code>not set</code></li>
+ * </ul>
+ *
+ * <p>
+ * <code>enabled</code>
+ * <p>
+ */
@Test
- public void canExtractEnabledValue() throws IOException {
- GlobalUsageSettingsFake reportSettings = new GlobalUsageSettingsFake("true", "", "");
- assertTrue(reportSettings.isAllInstancesReportingEnabled());
+ public void reportingIsENABLEDIfSysPropIsNOTSETAndRemotePropIsNOTSET() throws IOException {
+ GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("");
+ assertTrue(reportEnablement.isReportingEnabled());
}
+ /**
+ * <ul>
+ * <li>sys prop: <code>false</code></li>
+ * <li>remote prop: <code>not set</code></li>
+ * </ul>
+ *
+ * <p>
+ * <code>disabled</code>
+ * <p>
+ */
@Test
- public void canExtractDisabledValue() throws IOException {
- GlobalUsageSettingsFake reportSettings = new GlobalUsageSettingsFake("false", "", "");
- assertFalse(reportSettings.isAllInstancesReportingEnabled());
+ public void instanceReportingIsDISABLEDIfSysPropIsFALSEAndRemotePropIsNOTSET() throws IOException {
+ System.setProperty(GlobalUsageSettings.USAGE_REPORTING_ENABLED_KEY, Boolean.FALSE.toString());
+ GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("");
+ assertFalse(reportEnablement.isReportingEnabled());
}
+ /**
+ * <ul>
+ * <li>sys prop: <code>true</code></li>
+ * <li>remote prop: <code>false</code></li>
+ * </ul>
+ *
+ * <p>
+ * <code>disabled</code>
+ * <p>
+ */
@Test
- public void canExtractDisabledOutUndefinedValue() throws IOException {
- GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("Rubbish", "", "");
- assertFalse(reportEnablement.isAllInstancesReportingEnabled());
+ public void instanceReportingIsENABLEDIfSysPropIsTRUEAndRemotePropIsFALSE() throws IOException {
+ System.setProperty(GlobalUsageSettings.USAGE_REPORTING_ENABLED_KEY, Boolean.TRUE.toString());
+ GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("false");
+ assertFalse(reportEnablement.isReportingEnabled());
}
+ /**
+ * <ul>
+ * <li>sys prop: <code>not set</code></li>
+ * <li>remote prop: <code>false</code></li>
+ * </ul>
+ *
+ * <p>
+ * <code>disabled</code>
+ * <p>
+ */
@Test
- public void instanceReportingIsEnabledIfSysPropIsNotSet() throws IOException {
- GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("", "", "");
- assertTrue(reportEnablement.isInstanceReportingEnabled());
+ public void instanceReportingIsENABLEDIfSysPropIsNOTSETAndRemotePropIsTRUE() throws IOException {
+ GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("");
+ System.setProperty(GlobalUsageSettings.USAGE_REPORTING_ENABLED_KEY, Boolean.FALSE.toString());
+ assertFalse(reportEnablement.isReportingEnabled());
}
- @Test
- public void instanceReportingIsDisabledIfSysPropIsFalse() throws IOException {
- GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("", "", "");
- System.setProperty(GlobalUsageSettings.SYSPROPS_INSTANCE_ENABLED_KEY, Boolean.FALSE.toString());
- assertFalse(reportEnablement.isInstanceReportingEnabled());
- }
-
- @Test
- public void instanceReportingIsEnabledIfSysPropIsTrue() throws IOException {
- GlobalUsageSettingsFake reportEnablement = new GlobalUsageSettingsFake("", "", "");
- System.setProperty(GlobalUsageSettings.SYSPROPS_INSTANCE_ENABLED_KEY, Boolean.TRUE.toString());
- assertTrue(reportEnablement.isInstanceReportingEnabled());
- }
-
private class GlobalUsageSettingsFake extends GlobalUsageSettings {
- private String allInstancesEnabledValue;
- private String integerValue;
- private String stringValue;
+ private String usageReportingEnabled;
- public GlobalUsageSettingsFake(String allInstancesEnabledValue, String dummyValue, String anotherValue)
+ public GlobalUsageSettingsFake(String usageReportingEnabled)
throws IOException {
super(JBossToolsUsageTestActivator.getDefault());
- this.allInstancesEnabledValue = allInstancesEnabledValue;
- this.stringValue = dummyValue;
- this.integerValue = anotherValue;
+ this.usageReportingEnabled = usageReportingEnabled;
}
@Override
@@ -89,21 +114,18 @@
@Override
protected InputStreamReader request(HttpURLConnection urlConnection)
throws UnsupportedEncodingException {
- return new InputStreamReader(new ByteArrayInputStream(
- getRemotePropertiesRawData(
- allInstancesEnabledValue
- , stringValue
- , integerValue).getBytes())
+ return new InputStreamReader(
+ new ByteArrayInputStream(getRemotePropertiesRawData(usageReportingEnabled).getBytes())
, "UTF-8");
}
};
}
}
- private String getRemotePropertiesRawData(String enablementValue, String dummyValue, String integerValue) {
+ private String getRemotePropertiesRawData(String enablementValue) {
return "some rubbish at the beginning..."
- + GlobalUsageSettings.REMOTEPROPS_ALLINSTANCES_ENABLED_KEY
+ + GlobalUsageSettings.REMOTEPROPS_USAGE_REPORTING_ENABLED_KEY
+ enablementValue
+ "\n"
+ "#"
@@ -115,6 +137,6 @@
public void isPageAccessible() throws IOException {
GlobalUsageSettings reportEnablement = new GlobalUsageSettings(JBossToolsUsageTestActivator
.getDefault());
- System.err.println("Usage reporting is globally \"" + reportEnablement.isAllInstancesReportingEnabled() + "\"");
+ System.err.println("Usage reporting is globally \"" + reportEnablement.isReportingEnabled() + "\"");
}
}
Added: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java (rev 0)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java 2010-09-15 16:37:08 UTC (rev 24946)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.usage.test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+
+import org.jboss.tools.usage.http.HttpRemotePropertiesProvider;
+import org.junit.Test;
+
+/**
+ * Test for the global usage report settings. All tests are disabled yet,
+ * implementation's unfortunately still buggy.
+ */
+public class HttpRemotePropertiesTest {
+
+ private static final String KEY = "usage_reporting_enabled="; //$NON-NLS-1$
+
+ /** the delimiter that delimits the key/value-pairs */
+ private static final char VALUE_DELIMITER = '\n';
+
+ @Test
+ public void canExtractTrueValue() throws IOException {
+ HttpRemotePropertiesProvider propertiesProvider = createHttpPropertiesProvider("true", "", "", VALUE_DELIMITER, KEY);
+ assertEquals("true", propertiesProvider.getValueMap().get(KEY));
+ }
+
+ @Test
+ public void canExtractFalseValue() throws IOException {
+ HttpRemotePropertiesProvider propertiesProvider = createHttpPropertiesProvider("false", "", "", VALUE_DELIMITER, KEY);
+ assertEquals("false", propertiesProvider.getValueMap().get(KEY));
+ }
+
+ @Test
+ public void canExtractRubbish() throws IOException {
+ HttpRemotePropertiesProvider propertiesProvider = createHttpPropertiesProvider("Rubbish", "", "", VALUE_DELIMITER, KEY);
+ assertEquals("Rubbish", propertiesProvider.getValueMap().get(KEY));
+ }
+
+ private HttpRemotePropertiesProvider createHttpPropertiesProvider(final String booleanValue,
+ final String stringValue, final String anotherValue, char valueDelimiter, String... keys) {
+
+ return new HttpRemotePropertiesProvider("http://dummy", valueDelimiter,
+ JBossToolsUsageTestActivator.getDefault(), keys) {
+ @Override
+ protected InputStreamReader request(HttpURLConnection urlConnection)
+ throws UnsupportedEncodingException {
+ return new InputStreamReader(new ByteArrayInputStream(
+ getRemotePropertiesRawData(
+ booleanValue
+ , stringValue
+ , anotherValue).getBytes())
+ , "UTF-8");
+ }
+ };
+ }
+
+ private String getRemotePropertiesRawData(String enablementValue, String dummyValue, String integerValue) {
+
+ return "some rubbish at the beginning..."
+ + KEY
+ + enablementValue
+ + "\n"
+ + "#"
+ + "some rubbish at the end";
+ }
+}
Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/HttpRemotePropertiesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-15 16:35:19 UTC (rev 24945)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/UsageTestSuite.java 2010-09-15 16:37:08 UTC (rev 24946)
@@ -24,6 +24,7 @@
EclipseUserAgentTest.class,
ReportingEclipseEnvironmentTest.class,
JBossToolsComponentsTest.class,
+ HttpRemotePropertiesTest.class,
GlobalUsageSettingsTest.class,
JBossToolsUsageIntegrationTest.class })
public class UsageTestSuite {
15 years, 7 months
JBoss Tools SVN: r24945 - workspace/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-15 12:35:19 -0400 (Wed, 15 Sep 2010)
New Revision: 24945
Modified:
workspace/usage/usage.properties
Log:
[JBIDE-6953] renamed key have identical keys as sys prop and in the remote properties
Modified: workspace/usage/usage.properties
===================================================================
--- workspace/usage/usage.properties 2010-09-15 15:31:44 UTC (rev 24944)
+++ workspace/usage/usage.properties 2010-09-15 16:35:19 UTC (rev 24945)
@@ -1,2 +1,2 @@
-usage_allinstances_enabled=true
+usage_reportings_enabled=true
#
15 years, 7 months
JBoss Tools SVN: r24944 - trunk/tests/features/org.jboss.tools.test.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-15 11:31:44 -0400 (Wed, 15 Sep 2010)
New Revision: 24944
Modified:
trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
Log:
JBDS-1322 remove jbpm-convert from test suites
Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-09-15 15:28:54 UTC (rev 24943)
+++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-09-15 15:31:44 UTC (rev 24944)
@@ -207,11 +207,11 @@
version="0.0.0"
unpack="true"/>
- <plugin
+ <!-- JBDS-1322 removed <plugin
id="org.jboss.tools.jbpm.convert.test"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"/> -->
<plugin
id="org.jboss.tools.jsf.ui.test"
15 years, 7 months
JBoss Tools SVN: r24943 - trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-15 11:28:54 -0400 (Wed, 15 Sep 2010)
New Revision: 24943
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java
Log:
JBIDE-6998
https://jira.jboss.org/browse/JBIDE-6998
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-09-15 15:28:30 UTC (rev 24942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/src/org/jboss/tools/cdi/xml/ui/editor/form/CDIBeansFileFormLayoutData.java 2010-09-15 15:28:54 UTC (rev 24943)
@@ -63,7 +63,7 @@
return new FormData(
title,
CDIXMLFormLayoutData.EMPTY_DESCRIPTION,
- new FormAttributeData[]{new FormAttributeData("element type", 20, "Kind"), new FormAttributeData("name/pattern", 80)}, //$NON-NLS-1$
+ new FormAttributeData[]{new FormAttributeData("element type", 20, "Kind"), new FormAttributeData("name", 70), new FormAttributeData("is regular expression", 10, "RegEx")}, //$NON-NLS-1$
new String[]{"CDIWeldInclude", "CDIWeldExclude"},
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddItem") //$NON-NLS-1$
);
15 years, 7 months