JBoss Tools SVN: r37020 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-06 16:53:09 -0500 (Tue, 06 Dec 2011)
New Revision: 37020
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
Log:
[JBIDE-10171] corrected wrong var checking to detect which strategy was chosen ("create new project" / "import as app")
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-06 21:42:34 UTC (rev 37019)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-06 21:53:09 UTC (rev 37020)
@@ -68,7 +68,7 @@
private IStatus performOperations(IProgressMonitor monitor, IStatus status) {
try {
- if (model.isNewProject()) {
+ if (!model.isNewProject()) {
model.importProject(monitor);
} else {
model.enableProject(monitor);
14 years
JBoss Tools SVN: r37019 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-06 16:42:34 -0500 (Tue, 06 Dec 2011)
New Revision: 37019
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
Log:
[JBIDE-10171] corrected initial enablement state of "new project" checkbox
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 21:42:02 UTC (rev 37018)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 21:42:34 UTC (rev 37019)
@@ -66,7 +66,7 @@
private IServerType serverTypeToCreate;
private IObservableValue serverAdapterCheckboxObservable;
- private IObservableValue newProjectChecboxIsEnabled;
+ private IObservableValue newProjectCheckboxIsEnabled;
public AdapterWizardPage(ImportProjectWizard wizard, ImportProjectWizardModel model) {
super(
@@ -119,7 +119,7 @@
.to(newProjectObservable)
.in(dbc);
- this.newProjectChecboxIsEnabled = WidgetProperties.enabled().observe(newProjectCheckbox);
+ this.newProjectCheckboxIsEnabled = WidgetProperties.enabled().observe(newProjectCheckbox);
Label existingProjectLabel = new Label(projectGroup, SWT.NONE);
existingProjectLabel.setText("Existing Project");
@@ -137,9 +137,8 @@
.to(newProjectNameObservable)
.in(dbc);
ValueBindingBuilder
- .bind(newProjectObservable)
- .to(WidgetProperties.enabled().observe(newProjectText))
- .converting(new InvertingBooleanConverter())
+ .bind(WidgetProperties.enabled().observe(newProjectText))
+ .notUpdating(newProjectObservable)
.in(dbc);
dbc.addValidationStatusProvider(
new EnableProjectValidator(newProjectObservable, newProjectNameObservable));
@@ -150,13 +149,10 @@
.align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseProjectsButton);
browseProjectsButton.addSelectionListener(onBrowseProjects());
ValueBindingBuilder
- .bind(newProjectObservable)
- .to(WidgetProperties.enabled().observe(browseProjectsButton))
- .converting(new InvertingBooleanConverter())
+ .bind(WidgetProperties.enabled().observe(browseProjectsButton))
+ .notUpdating(newProjectObservable)
.in(dbc);
-// model.setNewProject(false);
-
return projectGroup;
}
@@ -381,15 +377,12 @@
}
private SelectionListener onCreateAdapter() {
- return new SelectionListener() {
+ return new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- model.getWizardModel().setProperty(AdapterWizardPageModel.CREATE_SERVER,
- serverAdapterCheckbox.getSelection());
+ model.getWizardModel().setProperty(
+ AdapterWizardPageModel.CREATE_SERVER,serverAdapterCheckbox.getSelection());
enableServerWidgets(serverAdapterCheckbox.getSelection());
}
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
};
}
@@ -406,7 +399,7 @@
// allow to enable a proj only for as7 openshift applications
setTitle(NLS.bind("Import OpenShift application {0}", model.getApplicationName()));
- newProjectChecboxIsEnabled.setValue(model.isJBossAS7Application());
+ newProjectCheckboxIsEnabled.setValue(model.isJBossAS7Application());
model.resetRepositoryPath();
serverTypeToCreate = getServerTypeToCreate();
@@ -423,7 +416,9 @@
model.loadGitUri();
model.loadApplicationUrl();
} catch (OpenShiftException e) {
- OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e));
+ IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e);
+ OpenShiftUIActivator.log(status);
+ return status;
}
return Status.OK_STATUS;
}
14 years
JBoss Tools SVN: r37018 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-06 16:42:02 -0500 (Tue, 06 Dec 2011)
New Revision: 37018
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
Log:
[JBIDE-10171] corrected bad var naming
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-06 21:34:18 UTC (rev 37017)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-06 21:42:02 UTC (rev 37018)
@@ -49,8 +49,8 @@
setNewProject(false);
}
- public void setNewProject(boolean enableProject) {
- firePropertyChange(PROPERTY_NEW_PROJECT, wizardModel.isNewProject(), wizardModel.setNewProject(enableProject));
+ public void setNewProject(boolean newProject) {
+ firePropertyChange(PROPERTY_NEW_PROJECT, wizardModel.isNewProject(), wizardModel.setNewProject(newProject));
}
public boolean isNewProject() {
14 years
JBoss Tools SVN: r37017 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-06 16:34:18 -0500 (Tue, 06 Dec 2011)
New Revision: 37017
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java
Log:
JBIDE-10364
https://issues.jboss.org/browse/JBIDE-10364
Initialized filter text field input in Preferences dialog invoked by "Configure Problem Severity" quick fix.
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java 2011-12-06 21:29:36 UTC (rev 37016)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityConfigurationBlock.java 2011-12-06 21:34:18 UTC (rev 37017)
@@ -84,7 +84,11 @@
protected PixelConverter fPixelConverter;
protected FilteredPreferenceTree fFilteredPrefTree;
-
+ /**
+ * Text control retrieved from fFilteredPrefTree.
+ */
+ protected Text filterControl;
+
public SeverityConfigurationBlock(IStatusChangeListener context,
IProject project, Key[] allKeys,
IWorkbenchPreferenceContainer container) {
@@ -110,8 +114,13 @@
addMaxNumberOfMarkersField(c);
}
addWrongBuilderOrderField(c);
+
+ Control[] currentControls = folder.getChildren();
fFilteredPrefTree = new FilteredPreferenceTree(this, folder, getCommonDescription());
+
+ filterControl = findText(folder, currentControls.length);
+
final ScrolledPageContent sc1 = fFilteredPrefTree.getScrolledPageContent();
Composite composite = sc1.getBody();
@@ -129,6 +138,22 @@
return sc1;
}
+ Text findText(Composite composite, int startFromIndex) {
+ Control[] cs = composite.getChildren();
+ for (int i = startFromIndex; i < cs.length; i++) {
+ Control cl = cs[i];
+ if(cl instanceof Text) {
+ return (Text)cl;
+ } else if(cl instanceof Composite) {
+ Text t = findText((Composite)cl, 0);
+ if(t != null) {
+ return t;
+ }
+ }
+ }
+ return null;
+ }
+
protected Composite createInnerComposite(ExpandableComposite excomposite, int nColumns, Font font) {
Composite inner= new Composite(excomposite, SWT.NONE);
inner.setFont(font);
@@ -301,6 +326,10 @@
key = getKey(pluginId, keyName);
}
}
+
+ public Text getFilterControl() {
+ return filterControl;
+ }
public void doFilter(String prefId){
String qualifier = getQualifier();
@@ -314,8 +343,13 @@
if(combo != null){
String value = ((Label)fLabels.get(combo)).getText();
- if(value != null)
- fFilteredPrefTree.doFilter(value);
+ if(value != null) {
+ if(filterControl != null) {
+ filterControl.setText(value);
+ } else {
+ fFilteredPrefTree.doFilter(value);
+ }
+ }
}
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java 2011-12-06 21:29:36 UTC (rev 37016)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java 2011-12-06 21:34:18 UTC (rev 37017)
@@ -164,4 +164,12 @@
super.applyData(data);
}
}
-}
\ No newline at end of file
+
+ /**
+ * Used by test.
+ * @return
+ */
+ public String getFilterText() {
+ return getConfigurationBlock().getFilterControl().getText();
+ }
+}
14 years
JBoss Tools SVN: r37016 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-06 16:29:36 -0500 (Tue, 06 Dec 2011)
New Revision: 37016
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-10171] corrected typo
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-06 21:11:09 UTC (rev 37015)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-06 21:29:36 UTC (rev 37016)
@@ -68,7 +68,7 @@
private HashMap<String, Object> dataModel = new HashMap<String, Object>();
- public static final String NEw_PROJECT = "enableProject";
+ public static final String NEW_PROJECT = "enableProject";
public static final String USER = "user";
public static final String APPLICATION = "application";
public static final String REMOTE_NAME = "remoteName";
@@ -77,7 +77,7 @@
public static final String MERGE_URI = "mergeUri";
public ImportProjectWizardModel() {
- dataModel.put(NEw_PROJECT, false);
+ dataModel.put(NEW_PROJECT, false);
}
public Object setProperty(String key, Object value) {
@@ -152,11 +152,11 @@
}
public boolean isNewProject() {
- return (Boolean) getProperty(NEw_PROJECT);
+ return (Boolean) getProperty(NEW_PROJECT);
}
public Boolean setNewProject(boolean newProject) {
- return (Boolean) setProperty(NEw_PROJECT, newProject);
+ return (Boolean) setProperty(NEW_PROJECT, newProject);
}
public String setProjectName(String projectName) {
14 years
JBoss Tools SVN: r37015 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-06 16:11:09 -0500 (Tue, 06 Dec 2011)
New Revision: 37015
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java
Log:
CDI EL Refactoring and Searchers don't look for ELs in dependent project https://issues.jboss.org/browse/JBIDE-10331
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2011-12-06 20:22:42 UTC (rev 37014)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2011-12-06 21:11:09 UTC (rev 37015)
@@ -11,6 +11,7 @@
package org.jboss.tools.jst.web.kb.refactoring;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.StringTokenizer;
@@ -82,7 +83,10 @@
private void scanProject(IProject project){
if(project == null || !project.exists()) return;
+ if(doneProjects.contains(project)) return;
+ doneProjects.add(project);
+
IProject[] referencingProject = project.getReferencingProjects();
for(IProject rProject: referencingProject){
scanProject(rProject);
@@ -125,11 +129,15 @@
}
}
}
+
+ private HashSet<IProject> doneProjects = new HashSet<IProject>();
- public void findELReferences(){
+ public final void findELReferences(){
if(baseFile == null)
return;
+ doneProjects.clear();
+
//startStatistics();
IProject[] projects = getProjects();
14 years
JBoss Tools SVN: r37014 - branches/jbosstools-3.3.0.M5/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-12-06 15:22:42 -0500 (Tue, 06 Dec 2011)
New Revision: 37014
Modified:
branches/jbosstools-3.3.0.M5/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/BrowserUtil.java
Log:
JBIDE-10365 make both common and as browser open actually open with addresssbar
Modified: branches/jbosstools-3.3.0.M5/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/BrowserUtil.java
===================================================================
--- branches/jbosstools-3.3.0.M5/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/BrowserUtil.java 2011-12-06 20:22:34 UTC (rev 37013)
+++ branches/jbosstools-3.3.0.M5/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/BrowserUtil.java 2011-12-06 20:22:42 UTC (rev 37014)
@@ -20,6 +20,7 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.browser.IWebBrowser;
+import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
/**
* @author Andre Dietisheim
@@ -41,7 +42,7 @@
*/
public static void checkedCreateInternalBrowser(String url, String browserId, String pluginId, ILog log) {
try {
- openUrl(url, PlatformUI.getWorkbench().getBrowserSupport().createBrowser(browserId), pluginId, log);
+ openUrl(url, PlatformUI.getWorkbench().getBrowserSupport().createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, browserId, null, null), pluginId, log);
} catch (PartInitException e) {
IStatus errorStatus = createErrorStatus(pluginId, CommonUIMessages.BROWSER_COULD_NOT_OPEN_BROWSER, e, url);
log.log(errorStatus);
14 years
JBoss Tools SVN: r37013 - branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-12-06 15:22:34 -0500 (Tue, 06 Dec 2011)
New Revision: 37013
Modified:
branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
Log:
JBIDE-10365 make both common and as browser open actually open with addresssbar
Modified: branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java
===================================================================
--- branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-06 20:01:13 UTC (rev 37012)
+++ branches/jbosstools-3.3.0.M5/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBTWebLaunchableClient.java 2011-12-06 20:22:34 UTC (rev 37013)
@@ -275,7 +275,7 @@
private static final String BROWSER_COULD_NOT_OPEN_BROWSER = "Unable to open web browser"; //$NON-NLS-1$
public static void checkedCreateInternalBrowser(String url, String browserId, String pluginId, ILog log) {
try {
- openUrl(url, PlatformUI.getWorkbench().getBrowserSupport().createBrowser(browserId), pluginId, log);
+ openUrl(url, PlatformUI.getWorkbench().getBrowserSupport().createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, browserId, null, null), pluginId, log);
} catch (PartInitException e) {
IStatus errorStatus = createErrorStatus(pluginId, BROWSER_COULD_NOT_OPEN_BROWSER, e, url);
log.log(errorStatus);
14 years
JBoss Tools SVN: r37012 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-12-06 15:01:13 -0500 (Tue, 06 Dec 2011)
New Revision: 37012
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-10171] implemented "new project" checkbox
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 19:43:27 UTC (rev 37011)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-06 20:01:13 UTC (rev 37012)
@@ -30,11 +30,11 @@
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog;
@@ -66,11 +66,11 @@
private IServerType serverTypeToCreate;
private IObservableValue serverAdapterCheckboxObservable;
- private IObservableValue enableProjectChecboxIsEnabled;
-
+ private IObservableValue newProjectChecboxIsEnabled;
+
public AdapterWizardPage(ImportProjectWizard wizard, ImportProjectWizardModel model) {
super(
- "Import Project",
+ "Import OpenShift application",
"Select the project to enable, the Git clone destination, the branch to clone"
+ " and configure your server adapter ",
"Server Adapter",
@@ -83,83 +83,81 @@
protected void doCreateControls(Composite parent, DataBindingContext dbc) {
GridLayoutFactory.fillDefaults().applyTo(parent);
- Group mergeGroup = createMergeGroup(parent, dbc);
+ Group mergeGroup = createProjectGroup(parent, dbc);
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(mergeGroup);
+ .align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(mergeGroup);
Group cloneGroup = createCloneGroup(parent, dbc);
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(cloneGroup);
+ .align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(cloneGroup);
Group serverAdapterGroup = createAdapterGroup(parent, dbc);
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(serverAdapterGroup);
+ .align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(serverAdapterGroup);
+
+ Label fillerLabel = new Label(parent, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(fillerLabel);
+
}
- private Group createMergeGroup(Composite parent, DataBindingContext dbc) {
- Group mergeGroup = new Group(parent, SWT.BORDER);
- mergeGroup.setText("Enable Project");
+ private Group createProjectGroup(Composite parent, DataBindingContext dbc) {
+ Group projectGroup = new Group(parent, SWT.BORDER);
+ projectGroup.setText("Project");
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(mergeGroup);
- GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(3).applyTo(mergeGroup);
+ .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(projectGroup);
+ GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(3).applyTo(projectGroup);
- Button enableProjectButton = new Button(mergeGroup, SWT.CHECK);
- enableProjectButton.setText("Enable existing project");
+ Button newProjectCheckbox = new Button(projectGroup, SWT.CHECK);
+ newProjectCheckbox.setText("Create new Project");
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).applyTo(enableProjectButton);
- IObservableValue enableProjectObservable =
- BeanProperties.value(AdapterWizardPageModel.PROPERTY_ENABLE_PROJECT).observe(model);
+ .span(3, 1).align(SWT.FILL, SWT.CENTER).grab(true, true).applyTo(newProjectCheckbox);
+ IObservableValue newProjectObservable =
+ BeanProperties.value(AdapterWizardPageModel.PROPERTY_NEW_PROJECT).observe(model);
ValueBindingBuilder
- .bind(WidgetProperties.selection().observe(enableProjectButton))
- .to(enableProjectObservable)
+ .bind(WidgetProperties.selection().observe(newProjectCheckbox))
+ .to(newProjectObservable)
.in(dbc);
-
- this.enableProjectChecboxIsEnabled = WidgetProperties.enabled().observe(enableProjectButton);
- Text enabledProjectText = new Text(mergeGroup, SWT.BORDER);
- enabledProjectText.setEditable(false);
+ this.newProjectChecboxIsEnabled = WidgetProperties.enabled().observe(newProjectCheckbox);
+
+ Label existingProjectLabel = new Label(projectGroup, SWT.NONE);
+ existingProjectLabel.setText("Existing Project");
GridDataFactory
- .fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(enabledProjectText);
- // mergeUriComboViewer.setContentProvider(new ArrayContentProvider());
- // mergeUriComboViewer.setLabelProvider(new GitUriLabelProvider());
- // mergeUriComboViewer.setInput(model.getMergeUris());
- // ValueBindingBuilder
- // .bind(WidgetProperties.text().observe(mergeUriCombo))
- // .validatingAfterGet(new MergeUriValidator())
- // .to(BeanProperties.value(AdapterWizardPageModel.PROPERTY_MERGE_URI).observe(model))
- // .in(dbc);
+ .fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(existingProjectLabel);
+ Text newProjectText = new Text(projectGroup, SWT.BORDER);
+ newProjectText.setEditable(false);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).grab(true, true).applyTo(newProjectText);
- // ValueBindingBuilder
- // .bind(mergeEnabledButtonSelection)
- // .to(WidgetProperties.enabled().observe(mergeUriCombo))
- // .in(dbc);
-
- IObservableValue enabledProjectNameObservable =
+ IObservableValue newProjectNameObservable =
BeanProperties.value(AdapterWizardPageModel.PROPERTY_PROJECT_NAME).observe(model);
ValueBindingBuilder
- .bind(WidgetProperties.text().observe(enabledProjectText))
- .to(enabledProjectNameObservable)
+ .bind(WidgetProperties.text().observe(newProjectText))
+ .to(newProjectNameObservable)
.in(dbc);
ValueBindingBuilder
- .bind(enableProjectObservable)
- .to(WidgetProperties.enabled().observe(enabledProjectText))
+ .bind(newProjectObservable)
+ .to(WidgetProperties.enabled().observe(newProjectText))
+ .converting(new InvertingBooleanConverter())
.in(dbc);
dbc.addValidationStatusProvider(
- new EnableProjectValidator(enableProjectObservable, enabledProjectNameObservable));
+ new EnableProjectValidator(newProjectObservable, newProjectNameObservable));
- Button browseProjectsButton = new Button(mergeGroup, SWT.NONE);
+ Button browseProjectsButton = new Button(projectGroup, SWT.NONE);
browseProjectsButton.setText("Browse");
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseProjectsButton);
browseProjectsButton.addSelectionListener(onBrowseProjects());
ValueBindingBuilder
- .bind(enableProjectObservable)
+ .bind(newProjectObservable)
.to(WidgetProperties.enabled().observe(browseProjectsButton))
+ .converting(new InvertingBooleanConverter())
.in(dbc);
- enableProjectObservable.setValue(false);
-
- return mergeGroup;
+// model.setNewProject(false);
+
+ return projectGroup;
}
private Group createCloneGroup(Composite parent, DataBindingContext dbc) {
@@ -342,72 +340,73 @@
private Group createAdapterGroup(Composite parent, DataBindingContext dbc) {
Group serverAdapterGroup = new Group(parent, SWT.BORDER);
serverAdapterGroup.setText("JBoss Server adapter");
- FillLayout fillLayout = new FillLayout();
- fillLayout.marginHeight = 6;
- fillLayout.marginWidth = 6;
- serverAdapterGroup.setLayout(fillLayout);
- fillServerAdapterGroup(serverAdapterGroup);
+ GridLayoutFactory.fillDefaults().margins(6, 6).applyTo(serverAdapterGroup);
- return serverAdapterGroup;
- }
-
- protected void enableServerWidgets(boolean enabled) {
- domainValueLabel.setEnabled(enabled);
- modeValueLabel.setEnabled(enabled);
- }
-
- private void fillServerAdapterGroup(Group serverAdapterGroup) {
Composite c = new Composite(serverAdapterGroup, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(c);
GridLayoutFactory.fillDefaults().numColumns(3).spacing(12, 8).applyTo(c);
serverAdapterCheckbox = new Button(c, SWT.CHECK);
serverAdapterCheckbox.setText("Create a JBoss server adapter");
- serverAdapterCheckbox.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- model.getWizardModel().setProperty(AdapterWizardPageModel.CREATE_SERVER,
- serverAdapterCheckbox.getSelection());
- enableServerWidgets(serverAdapterCheckbox.getSelection());
- }
+ GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.CENTER)
+ .grab(true, false).applyTo(serverAdapterCheckbox);
+ serverAdapterCheckbox.addSelectionListener(onCreateAdapter());
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
-
Label domainLabel = new Label(c, SWT.NONE);
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(domainLabel);
domainLabel.setText("Host");
domainValueLabel = new Label(c, SWT.NONE);
- DataBindingContext dbc = getDataBindingContext();
+ GridDataFactory.fillDefaults()
+ .span(2, 1).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(domainValueLabel);
ValueBindingBuilder
.bind(WidgetProperties.text().observe(domainValueLabel))
.notUpdating(BeanProperties.value(AdapterWizardPageModel.PROPERTY_APPLICATION_URL).observe(model))
.in(dbc);
- // appLabel = new Label(c, SWT.NONE);
+
Label modeLabel = new Label(c, SWT.NONE);
modeLabel.setText("Mode");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(modeLabel);
modeValueLabel = new Label(c, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .span(2, 1).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(modeValueLabel);
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(domainLabel);
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(modeLabel);
- GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.CENTER)
- .grab(true, false).applyTo(domainValueLabel);
- GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.CENTER)
- .grab(true, false).applyTo(serverAdapterCheckbox);
- GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.CENTER)
- .grab(true, false).applyTo(modeValueLabel);
-
- model.getWizardModel().setProperty(AdapterWizardPageModel.CREATE_SERVER,
- serverAdapterCheckbox.getSelection());
+ model.getWizardModel().setProperty(
+ AdapterWizardPageModel.CREATE_SERVER, serverAdapterCheckbox.getSelection());
this.serverAdapterCheckboxObservable =
WidgetProperties.selection().observe(serverAdapterCheckbox);
+
+ return serverAdapterGroup;
}
+ private SelectionListener onCreateAdapter() {
+ return new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ model.getWizardModel().setProperty(AdapterWizardPageModel.CREATE_SERVER,
+ serverAdapterCheckbox.getSelection());
+ enableServerWidgets(serverAdapterCheckbox.getSelection());
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ };
+ }
+
+ protected void enableServerWidgets(boolean enabled) {
+ domainValueLabel.setEnabled(enabled);
+ modeValueLabel.setEnabled(enabled);
+ }
+
private IServerType getServerTypeToCreate() {
return ServerCore.findServerType("org.jboss.tools.openshift.express.openshift.server.type");
}
protected void onPageActivated(DataBindingContext dbc) {
// allow to enable a proj only for as7 openshift applications
- enableProjectChecboxIsEnabled.setValue(model.isJBossAS7Application());
+ setTitle(NLS.bind("Import OpenShift application {0}", model.getApplicationName()));
+
+ newProjectChecboxIsEnabled.setValue(model.isJBossAS7Application());
model.resetRepositoryPath();
serverTypeToCreate = getServerTypeToCreate();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-06 19:43:27 UTC (rev 37011)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-12-06 20:01:13 UTC (rev 37012)
@@ -24,7 +24,7 @@
private static final String REMOTE_NAME_DEFAULT = "origin";
- public static final String PROPERTY_ENABLE_PROJECT = "enableProject";
+ public static final String PROPERTY_NEW_PROJECT = "newProject";
public static final String PROPERTY_CLONE_URI = "cloneUri";
// public static final String PROPERTY_MERGE_URI = "mergeUri";
public static final String PROPERTY_PROJECT_NAME = "projectName";
@@ -46,14 +46,15 @@
public AdapterWizardPageModel(ImportProjectWizardModel wizardModel) {
this.wizardModel = wizardModel;
setRemoteName(REMOTE_NAME_DEFAULT);
+ setNewProject(false);
}
- public void setEnableProject(boolean enableProject) {
- firePropertyChange(PROPERTY_ENABLE_PROJECT, wizardModel.isEnableProject(), wizardModel.setEnableProject(enableProject));
+ public void setNewProject(boolean enableProject) {
+ firePropertyChange(PROPERTY_NEW_PROJECT, wizardModel.isNewProject(), wizardModel.setNewProject(enableProject));
}
- public boolean isEnableProject() {
- return wizardModel.isEnableProject();
+ public boolean isNewProject() {
+ return wizardModel.isNewProject();
}
public void setProjectName(String projectName) {
@@ -164,6 +165,14 @@
return application.getApplicationUrl();
}
+ public String getApplicationName() {
+ IApplication application = wizardModel.getApplication();
+ if (application == null) {
+ return null;
+ }
+ return application.getName();
+ }
+
public boolean isJBossAS7Application() {
IApplication application = wizardModel.getApplication();
if (application == null) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-06 19:43:27 UTC (rev 37011)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-06 20:01:13 UTC (rev 37012)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
-import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
@@ -54,13 +53,12 @@
try {
final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1);
WizardUtils.runInWizard(
- new WorkspaceJob("") {
+ new WorkspaceJob("Importing project to workspace...") {
@Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
IStatus status = Status.OK_STATUS;
status = performOperations(monitor, status);
-
if (!status.isOK()) {
OpenShiftUIActivator.log(status);
}
@@ -70,10 +68,10 @@
private IStatus performOperations(IProgressMonitor monitor, IStatus status) {
try {
- if (model.isEnableProject()) {
- model.enableProject(monitor);
- } else {
+ if (model.isNewProject()) {
model.importProject(monitor);
+ } else {
+ model.enableProject(monitor);
}
return Status.OK_STATUS;
} catch (IOException e) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-06 19:43:27 UTC (rev 37011)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-12-06 20:01:13 UTC (rev 37012)
@@ -68,7 +68,7 @@
private HashMap<String, Object> dataModel = new HashMap<String, Object>();
- public static final String ENABLE_PROJECT = "enableProject";
+ public static final String NEw_PROJECT = "enableProject";
public static final String USER = "user";
public static final String APPLICATION = "application";
public static final String REMOTE_NAME = "remoteName";
@@ -77,7 +77,7 @@
public static final String MERGE_URI = "mergeUri";
public ImportProjectWizardModel() {
- dataModel.put(ENABLE_PROJECT, false);
+ dataModel.put(NEw_PROJECT, false);
}
public Object setProperty(String key, Object value) {
@@ -151,12 +151,12 @@
return (String) getProperty(REPOSITORY_PATH);
}
- public boolean isEnableProject() {
- return (Boolean) getProperty(ENABLE_PROJECT);
+ public boolean isNewProject() {
+ return (Boolean) getProperty(NEw_PROJECT);
}
- public Boolean setEnableProject(boolean enableProject) {
- return (Boolean) setProperty(ENABLE_PROJECT, enableProject);
+ public Boolean setNewProject(boolean newProject) {
+ return (Boolean) setProperty(NEw_PROJECT, newProject);
}
public String setProjectName(String projectName) {
@@ -285,10 +285,6 @@
return project.exists();
}
- public void removeProject(String name) {
-
- }
-
private List<IProject> importMavenProject(final File gitProjectFolder, IProgressMonitor monitor)
throws CoreException, InterruptedException {
MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(gitProjectFolder);
14 years
JBoss Tools SVN: r37011 - branches/jbosstools-3.3.0.M5/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-12-06 14:43:27 -0500 (Tue, 06 Dec 2011)
New Revision: 37011
Modified:
branches/jbosstools-3.3.0.M5/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
Log:
https://issues.jboss.org/browse/JBIDE-9539 : Browsersim app for testing mobile/desktop web apps
- minor:reduced the devices list - removed portrait orientation, because now we have the rotation buttons
Modified: branches/jbosstools-3.3.0.M5/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
===================================================================
--- branches/jbosstools-3.3.0.M5/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2011-12-06 19:23:30 UTC (rev 37010)
+++ branches/jbosstools-3.3.0.M5/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2011-12-06 19:43:27 UTC (rev 37011)
@@ -1,15 +1,9 @@
0
PC (Default) -1 -1
-Apple iPad 2 (Portrait) 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5
-Apple iPad 2 (Landscape) 1024 768 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5
-Apple iPhone 3 (Portrait) 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
-Apple iPhone 3 (Landscape) 480 320 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
-Apple iPhone 4 (Portrait) 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
-Apple iPhone 4 (Landscape) 960 640 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
+Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5
+Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
+Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
RIM BlackBerry Bold Touch 9900 640 480 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+
-Samsung Galaxy S (Portrait) 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy S (Landscape) 800 480 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy S II (Portrait) 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy S II (Landscape) 800 480 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
-Samsung Galaxy Tab 10.1 (Portrait) 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13
-Samsung Galaxy Tab 10.1 (Landscape) 1280 800 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13
+Samsung Galaxy S 480 800 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+Samsung Galaxy S II 480 800 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1
+Samsung Galaxy Tab 10.1 800 1280 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13
14 years