JBoss Tools SVN: r39957 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: preferences and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-04-01 14:04:31 -0400 (Sun, 01 Apr 2012)
New Revision: 39957
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java
Log:
JBIDE-11054 - Project Examples : Last wizard page popping up should have a "Don't show next time" checkbox
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -57,6 +57,7 @@
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
@@ -106,6 +107,7 @@
import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
import org.jboss.tools.project.examples.configurators.DefaultJBossCentralConfigurator;
import org.jboss.tools.project.examples.configurators.IJBossCentralConfigurator;
+import org.jboss.tools.project.examples.dialog.MarkerDialog;
import org.jboss.tools.project.examples.fixes.PluginFix;
import org.jboss.tools.project.examples.fixes.ProjectExamplesFix;
import org.jboss.tools.project.examples.fixes.SeamRuntimeFix;
@@ -154,7 +156,16 @@
public static final String PROJECT_EXAMPLES_OUTPUT_DIRECTORY = "projectExamplesOutputDirectory"; //$NON-NLS-1$
public static final String PROJECT_EXAMPLES_DEFAULT = "projectExamplesDefaultLocation"; //$NON-NLS-1$
public static final boolean PROJECT_EXAMPLES_DEFAULT_VALUE = true;
+
+ public static final String SHOW_PROJECT_READY_WIZARD = "showProjectRadyWizard"; //$NON-NLS-1$
+ public static final boolean SHOW_PROJECT_READY_WIZARD_VALUE = true;
+ public static final String SHOW_README = "showReadme"; //$NON-NLS-1$
+ public static final boolean SHOW_README_VALUE = true;
+
+ public static final String SHOW_QUICK_FIX = "showQuickFix"; //$NON-NLS-1$
+ public static final boolean SHOW_QUICK_FIX_VALUE = true;
+
private static final String IMPORT_PROJECT_EXAMPLES_EXTENSION_ID = "org.jboss.tools.project.examples.importProjectExamples"; //$NON-NLS-1$
private static final String NAME = "name"; //$NON-NLS-1$
private static final String TYPE = "type"; //$NON-NLS-1$
@@ -951,6 +962,31 @@
public static void showReadyWizard(final List<ProjectExample> projects) {
+ IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+
+ boolean showProjectReadyWizard = store.getBoolean(SHOW_PROJECT_READY_WIZARD);
+ if (!showProjectReadyWizard) {
+ boolean openWelcome = store.getBoolean(SHOW_README);
+ if (openWelcome) {
+ ProjectExamplesActivator.openWelcome(projects);
+ }
+ boolean showQuickFix = store.getBoolean(SHOW_QUICK_FIX);
+ if (showQuickFix) {
+ List<IMarker> markers = getMarkers(projects);
+ if (markers != null && markers.size() > 0) {
+
+ Display.getCurrent().asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ Dialog dialog = new MarkerDialog(Display.getCurrent().getActiveShell(), projects);
+ dialog.open();
+ }
+ });
+ }
+ }
+ return;
+ }
Display.getDefault().asyncExec(new Runnable() {
public void run() {
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -62,6 +62,9 @@
private Button showInvalidSites;
private Text outputDirectoryText;
private Button isWorkspace;
+ private Button showProjectReadyWizard;
+ private Button showReadme;
+ private Button showQuickFix;
@Override
protected Control createContents(Composite parent) {
@@ -126,6 +129,18 @@
});
+ showProjectReadyWizard = new Button(composite,SWT.CHECK);
+ showProjectReadyWizard.setText("Show Project Ready wizard");
+ showProjectReadyWizard.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD));
+
+ showReadme = new Button(composite,SWT.CHECK);
+ showReadme.setText("Show readme/cheatsheet file");
+ showReadme.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_README));
+
+ showQuickFix = new Button(composite,SWT.CHECK);
+ showQuickFix.setText("Show Quick Fix dialog");
+ showQuickFix.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_QUICK_FIX));
+
showExperimentalSites = new Button(composite,SWT.CHECK);
showExperimentalSites.setText(Messages.ProjectExamplesPreferencePage_Show_experimental_sites);
showExperimentalSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES));
@@ -261,6 +276,10 @@
@Override
protected void performDefaults() {
+ showProjectReadyWizard.setSelection(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD_VALUE);
+ showReadme.setSelection(ProjectExamplesActivator.SHOW_README_VALUE);
+ showQuickFix.setSelection(ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE);
+
showExperimentalSites.setSelection(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES_VALUE);
showInvalidSites.setSelection(ProjectExamplesActivator.SHOW_INVALID_SITES_VALUE);
isWorkspace.setSelection(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT_VALUE);
@@ -278,6 +297,10 @@
private void storePreferences() {
IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+ store.setValue(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD, showProjectReadyWizard.getSelection());
+ store.setValue(ProjectExamplesActivator.SHOW_README, showReadme.getSelection());
+ store.setValue(ProjectExamplesActivator.SHOW_QUICK_FIX, showQuickFix.getSelection());
+
store.setValue(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES, showExperimentalSites.getSelection());
store.setValue(ProjectExamplesActivator.SHOW_INVALID_SITES, showInvalidSites.getSelection());
store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT, isWorkspace.getSelection());
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -26,7 +26,7 @@
@Override
public void initializeDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode("org.jboss.tools.project.examples"); //$NON-NLS-1$
+ IEclipsePreferences node = DefaultScope.INSTANCE.getNode("org.jboss.tools.project.examples"); //$NON-NLS-1$
node.putBoolean(
ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES,
@@ -38,6 +38,15 @@
node.putBoolean(
ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT,
ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT_VALUE);
+ node.putBoolean(
+ ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD,
+ ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD_VALUE);
+ node.putBoolean(
+ ProjectExamplesActivator.SHOW_README,
+ ProjectExamplesActivator.SHOW_README_VALUE);
+ node.putBoolean(
+ ProjectExamplesActivator.SHOW_QUICK_FIX,
+ ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE);
}
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java 2012-04-01 14:27:37 UTC (rev 39956)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesReadyPage.java 2012-04-01 18:04:31 UTC (rev 39957)
@@ -4,10 +4,13 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -33,7 +36,7 @@
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout(1,false));
- GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
composite.setLayoutData(gd);
Dialog.applyDialogFont(composite);
setControl(composite);
@@ -52,27 +55,80 @@
showReadme.setSelection(false);
showReadme.setEnabled(false);
+ final Button showMe = new Button(composite, SWT.CHECK);
+ gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+ gd.verticalAlignment = SWT.BOTTOM;
+ showMe.setLayoutData(gd);
+ showMe.setText("Do not show this page again");
+ final IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+
+ showMe.setSelection(!store.getBoolean(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD));
+
+ showMe.addSelectionListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ store.setValue(ProjectExamplesActivator.SHOW_PROJECT_READY_WIZARD, !showMe.getSelection());
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+
if (projectExamples != null && projectExamples.size() > 0) {
configure(projectExamples);
}
setPageComplete(true);
+
+ if (showReadme.isEnabled()) {
+ showReadme.addSelectionListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ store.setValue(ProjectExamplesActivator.SHOW_README, showReadme.getSelection());
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+ }
+ if (showQuickFix.isEnabled()) {
+ showQuickFix.addSelectionListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ store.setValue(ProjectExamplesActivator.SHOW_QUICK_FIX, showQuickFix.getSelection());
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+ }
}
public void configure(List<ProjectExample> projectExamples) {
ProjectExample projectExample = projectExamples.get(0);
+ IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+
if (projectExample != null) {
setTitle(projectExample.getShortDescription());
setDescription("'" + projectExample.getShortDescription() + "' Project is now ready");
if (showReadme != null) {
if (projectExample.isWelcome()) {
showReadme.setEnabled(true);
- showReadme.setSelection(true);
+ showReadme.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_README));
String urlString = projectExample.getWelcomeURL();
String welcomeURL = ProjectExamplesActivator.replace(urlString, projectExample);
showReadme.setText("Show '" + welcomeURL + "' for further instructions");
} else {
showReadme.setEnabled(false);
- showReadme.setSelection(false);
+ showReadme.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_README));
showReadme.setText(SHOW_README_FILE_FOR_FURTHER_INSTRUCTIONS);
}
}
@@ -80,7 +136,7 @@
.getMarkers(projectExamples);
if (markers != null && markers.size() > 0) {
showQuickFix.setEnabled(true);
- showQuickFix.setSelection(true);
+ showQuickFix.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_QUICK_FIX));
}
}
}
13 years, 6 months
JBoss Tools SVN: r39956 - trunk/examples/plugins/org.jboss.tools.project.examples.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-04-01 10:27:37 -0400 (Sun, 01 Apr 2012)
New Revision: 39956
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
Log:
JBIDE-11443 - AS 7.1.1 added into downloadable Runtimes list
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-04-01 10:44:22 UTC (rev 39955)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/plugin.xml 2012-04-01 14:27:37 UTC (rev 39956)
@@ -91,6 +91,13 @@
<extension
point="org.jboss.tools.project.examples.downloadruntimes">
<runtime
+ id="org.jboss.tools.runtime.core.as.711"
+ name="JBoss AS 7.1.1 Certified Java EE 6 Full Profile"
+ version="7.1.1.Final"
+ size="127MB"
+ url="http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1..."
+ disclaimer="true"/>
+ <runtime
id="org.jboss.tools.runtime.core.as.710"
name="JBoss AS 7.1.0 Certified Java EE 6 Full Profile"
version="7.1.0.Final"
13 years, 6 months
JBoss Tools SVN: r39955 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-04-01 06:44:22 -0400 (Sun, 01 Apr 2012)
New Revision: 39955
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/OpenFileCallback.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java
Log:
https://issues.jboss.org/browse/JBIDE-11179 : BrowserSim - add a view source option
- added exceptions logging
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/OpenFileCallback.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/OpenFileCallback.java 2012-04-01 10:29:26 UTC (rev 39954)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/OpenFileCallback.java 2012-04-01 10:44:22 UTC (rev 39955)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.browsersim.eclipse.callbacks;
import java.io.File;
+import java.io.FileNotFoundException;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileStore;
@@ -20,6 +21,7 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.vpe.browsersim.eclipse.Activator;
import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher;
import org.jboss.tools.vpe.browsersim.eclipse.util.TransparentReader;
@@ -49,7 +51,8 @@
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
- File fileToOpen = new File(lastString.substring(OPEN_FILE_COMMAND.length()));
+ String fileNameToOpen = lastString.substring(OPEN_FILE_COMMAND.length());
+ File fileToOpen = new File(fileNameToOpen);
if (fileToOpen.exists() && fileToOpen.isFile()) {
IFileStore fileStore = EFS.getLocalFileSystem().getStore(fileToOpen.toURI());
@@ -60,13 +63,15 @@
try {
IDE.openEditorOnFileStore(page, fileStore);
} catch (PartInitException e) {
- //TODO: put exception handler
+ Activator.logError(e.getMessage(), e);
}
} else {
- // TODO: log exception
+ Exception e = new Exception("Cannot obtain workbench page");
+ Activator.logError(e.getMessage(), e);
}
} else {
- //TODO: Do something if the file does not exist
+ FileNotFoundException e = new FileNotFoundException("Cannot open file: " + fileNameToOpen);
+ Activator.logError(e.getMessage(), e);
}
}
});
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java 2012-04-01 10:29:26 UTC (rev 39954)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java 2012-04-01 10:44:22 UTC (rev 39955)
@@ -32,6 +32,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.browsersim.eclipse.Activator;
import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher;
import org.jboss.tools.vpe.browsersim.eclipse.util.TransparentReader;
@@ -128,10 +129,11 @@
editor.doSave(null); // reset resource-changed marker
}
} catch (PartInitException e) {
- // TODO: log exception
+ Activator.logError(e.getMessage(), e);
}
} else {
- // TODO: log exception
+ Exception e = new Exception("Cannot obtain workbench page");
+ Activator.logError(e.getMessage(), e);
}
}
}
13 years, 6 months
JBoss Tools SVN: r39954 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse: util and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-04-01 06:29:26 -0400 (Sun, 01 Apr 2012)
New Revision: 39954
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/TransparentReader.java
Log:
https://issues.jboss.org/browse/JBIDE-11179 : BrowserSim - add a view source option
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java 2012-04-01 10:26:24 UTC (rev 39953)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java 2012-04-01 10:29:26 UTC (rev 39954)
@@ -30,7 +30,6 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorPart;
import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/TransparentReader.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/TransparentReader.java 2012-04-01 10:26:24 UTC (rev 39953)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/TransparentReader.java 2012-04-01 10:29:26 UTC (rev 39954)
@@ -29,9 +29,9 @@
public String readLine(boolean forwardToConcole) throws IOException {
StringBuilder nextLine = new StringBuilder();
- int nextCharInt;
+ int nextCharInt = -1;
boolean eolReached = false;
- while ((nextCharInt = reader.read()) >= 0 && !eolReached) {
+ while (!eolReached && (nextCharInt = reader.read()) >= 0) {
char nextChar = (char) nextCharInt;
if (forwardToConcole) {
output.print(nextChar);
13 years, 6 months
JBoss Tools SVN: r39953 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse: src/org/jboss/tools/vpe/browsersim/eclipse/callbacks and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-04-01 06:26:24 -0400 (Sun, 01 Apr 2012)
New Revision: 39953
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java
Log:
https://issues.jboss.org/browse/JBIDE-11179 : BrowserSim - add a view source option
- added support of VPE
- NPE fixes
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2012-04-01 10:06:20 UTC (rev 39952)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2012-04-01 10:26:24 UTC (rev 39953)
@@ -12,7 +12,11 @@
org.eclipse.ui.editors,
org.eclipse.ui.ide,
org.eclipse.ui.browser,
- org.eclipse.core.filesystem
+ org.eclipse.core.filesystem,
+ org.jboss.tools.jst.jsp;bundle-version="3.3.0";resolution:=optional,
+ org.eclipse.wst.sse.ui;resolution:=optional,
+ org.jboss.tools.common.text.ext;bundle-version="3.3.0";resolution:=optional,
+ org.jboss.tools.jst.web;bundle-version="3.3.0";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java 2012-04-01 10:06:20 UTC (rev 39952)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/callbacks/ViewSourceCallback.java 2012-04-01 10:26:24 UTC (rev 39953)
@@ -23,13 +23,16 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IPersistableElement;
import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.EditorPart;
import org.eclipse.ui.texteditor.ITextEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.browsersim.eclipse.util.BrowserSimLauncher;
import org.jboss.tools.vpe.browsersim.eclipse.util.TransparentReader;
@@ -85,7 +88,7 @@
IStorage storage = new StringStorage("", // see the long comment below to know why an empty storage is created
"view-source.html"); // .html extension is needed to enable code highlighting in the WTP HTML editor
IStorageEditorInput input = new StringInput(storage, name, toolTip);
- ITextEditor editor = (ITextEditor) page.openEditor(input, editorId);
+ IEditorPart editor = page.openEditor(input, editorId);
/* We change content of the editor AFTER the editor is created
* as a workaround for the following WTP bug.
@@ -94,9 +97,37 @@
* is created and freezes UI.
* See http://www.eclipse.org/forums/index.php/m/639937/
*/
- IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- document.set(content);
- editor.doSave(null); // reset resource-changed marker
+ IDocument doc = null;
+
+ // this checking is needed to do not load jst.jsp plug-ins if it is unnecessary
+ if ("org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor".equals(editorId)) {
+ try {
+ if (editor instanceof JSPMultiPageEditor) {
+ JSPMultiPageEditor multiPageEditor = (JSPMultiPageEditor) editor;
+ doc = multiPageEditor.getSourceEditor().getTextViewer().getDocument();
+ }
+ } catch (NoClassDefFoundError e1) {
+ // this is OK - there are some optional dependencies
+ }
+ }
+
+ if (doc == null) {
+ ITextEditor textEditor = null;
+ if (editor instanceof ITextEditor) {
+ textEditor = (ITextEditor) editor;
+ } else {
+ textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
+ }
+
+ if (textEditor != null) {
+ doc = textEditor.getDocumentProvider().getDocument(input);
+ }
+ }
+
+ if (doc != null) {
+ doc.set(content);
+ editor.doSave(null); // reset resource-changed marker
+ }
} catch (PartInitException e) {
// TODO: log exception
}
13 years, 6 months
JBoss Tools SVN: r39952 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-04-01 06:06:20 -0400 (Sun, 01 Apr 2012)
New Revision: 39952
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/StorageRevisionEditorInputAdapter.java
Log:
https://issues.jboss.org/browse/JBIDE-11179 : BrowserSim - add a view source option
- fixed NPE for in-memory storage (storage without path)
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/StorageRevisionEditorInputAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/StorageRevisionEditorInputAdapter.java 2012-03-31 03:33:13 UTC (rev 39951)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/StorageRevisionEditorInputAdapter.java 2012-04-01 10:06:20 UTC (rev 39952)
@@ -64,7 +64,7 @@
}
public String getName() {
- return storage.getFullPath().toString();
+ return storage.getFullPath() != null ? storage.getFullPath().toString() : null;
}
public boolean isReadOnly() {
13 years, 6 months