This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch
refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to
refs/heads/refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase by this
push:
new daa7e79 [UIMA-6373] Format UIMA Core Java SDK codebase
daa7e79 is described below
commit daa7e795a5aa9c4d7a3c5f89b931e865086f32fc
Author: Richard Eckart de Castilho <[email protected]>
AuthorDate: Thu Feb 10 14:54:24 2022 +0100
[UIMA-6373] Format UIMA Core Java SDK codebase
- Auto-format
---
.../java/org/apache/uima/pear/PearException.java | 33 ++++----
.../main/java/org/apache/uima/pear/PearPlugin.java | 4 +-
.../uima/pear/actions/AddUimaNatureAction.java | 26 +++---
.../actions/EditInstallationDescriptorAction.java | 20 +++--
.../uima/pear/actions/GeneratePearFileAction.java | 16 ++--
.../actions/PearProjectCustomizationException.java | 37 ++++----
.../uima/pear/generate/GeneratePearWizard.java | 43 +++++-----
.../org/apache/uima/pear/generate/PearExport.java | 15 ++--
.../uima/pear/generate/PearExportMessages.java | 1 -
.../uima/pear/generate/PearExportOperation.java | 37 ++++----
.../pear/generate/PearFileResourceExportPage.java | 58 +++++++------
.../edit/EditInstallationDescriptorWizard.java | 22 ++---
.../uima/pear/insd/edit/INSDComponentPage.java | 99 +++++++++++++---------
.../uima/pear/insd/edit/INSDEnvironmentPage.java | 98 +++++++++++----------
.../apache/uima/pear/insd/edit/InsdConstants.java | 1 -
.../pear/insd/edit/PearInstallationDescriptor.java | 16 ++--
.../edit/vars/AbstractVarValViewerHandler.java | 49 +++++++----
.../pear/insd/edit/vars/IVarValListViewer.java | 10 ++-
.../apache/uima/pear/insd/edit/vars/VarVal.java | 13 +--
.../pear/insd/edit/vars/VarValCellModifier.java | 33 +++++---
.../pear/insd/edit/vars/VarValLabelProvider.java | 13 +--
.../uima/pear/insd/edit/vars/VarValList.java | 37 ++++----
.../uima/pear/insd/edit/vars/VarValSorter.java | 4 +-
.../pear/insd/edit/vars/VarValViewerHandler.java | 29 +++++--
.../apache/uima/pear/nature/ProjectCustomizer.java | 6 +-
.../org/apache/uima/pear/nature/UimaNature.java | 4 +-
26 files changed, 420 insertions(+), 304 deletions(-)
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
index 7f8838a..7030f74 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearException.java
@@ -27,7 +27,6 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.swt.widgets.Shell;
-
/**
*
* This is the generic exception used to handle exceptions related to PEAR.
@@ -41,7 +40,6 @@ public class PearException extends Exception {
/** The Constant serialVersionUID. */
private static final long serialVersionUID = 1L;
-
/**
* Instantiates a new pear exception.
*/
@@ -51,7 +49,8 @@ public class PearException extends Exception {
/**
* Instantiates a new pear exception.
*
- * @param message the message
+ * @param message
+ * the message
*/
public PearException(String message) {
super(message);
@@ -60,7 +59,8 @@ public class PearException extends Exception {
/**
* Instantiates a new pear exception.
*
- * @param cause the cause
+ * @param cause
+ * the cause
*/
public PearException(Throwable cause) {
super(cause);
@@ -69,8 +69,10 @@ public class PearException extends Exception {
/**
* Instantiates a new pear exception.
*
- * @param message the message
- * @param cause the cause
+ * @param message
+ * the message
+ * @param cause
+ * the cause
*/
public PearException(String message, Throwable cause) {
super(message, cause);
@@ -87,18 +89,18 @@ public class PearException extends Exception {
IStatus[] sa = new IStatus[o.length];
for (int i = 0; i < o.length; i++) {
sa[i] = (IStatus) o[i];
- }
+ }
return sa;
- }
- else {
- return new IStatus[0];
+ } else {
+ return new IStatus[0];
}
}
/**
* Gets the custom stack trace.
*
- * @param e the e
+ * @param e
+ * the e
* @return the custom stack trace
*/
synchronized ArrayList getCustomStackTrace(Throwable e) {
@@ -115,7 +117,7 @@ public class PearException extends Exception {
Throwable aCause = e.getCause();
if (aCause != null) {
a.addAll(getCustomStackTrace(aCause));
- }
+ }
}
return a;
}
@@ -123,7 +125,8 @@ public class PearException extends Exception {
/**
* opens an ErrorDialog with details about this exception.
*
- * @param shell the shell
+ * @param shell
+ * the shell
*/
public void openErrorDialog(Shell shell) {
try {
@@ -132,8 +135,8 @@ public class PearException extends Exception {
msg = msg == null ? "" : msg; //$NON-NLS-1$
MultiStatus status = new MultiStatus(PLUGIN_ID, IStatus.ERROR,
getCustomStackTrace(), msg,
getCause());
- ErrorDialog.openError(shell, "Operation Error", getMessage()
- + " \nPlease see the details (below).", status, 0xFFFF);
+ ErrorDialog.openError(shell, "Operation Error",
+ getMessage() + " \nPlease see the details (below).", status,
0xFFFF);
} catch (Throwable th) {
th.printStackTrace();
}
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java
index fc298e5..8ae5f48 100644
--- a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java
+++ b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/PearPlugin.java
@@ -25,7 +25,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
-
/**
* The main plugin class.
*
@@ -81,7 +80,8 @@ public class PearPlugin extends AbstractUIPlugin {
/**
* Returns the image descriptor with the given path relative to the icons/
directory.
*
- * @param relativePath the relative path
+ * @param relativePath
+ * the relative path
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(final String relativePath) {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java
index 361faa2..7644aa9 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/AddUimaNatureAction.java
@@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
-
/**
* This class handles the "Add UIMA Nature" action, which appear in the
context menu of a project.
*/
@@ -51,8 +50,10 @@ public class AddUimaNatureAction implements
IObjectActionDelegate {
/**
* Sets the active part.
*
- * @param action the action
- * @param targetPart the target part
+ * @param action
+ * the action
+ * @param targetPart
+ * the target part
* @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
*/
@Override
@@ -62,7 +63,8 @@ public class AddUimaNatureAction implements
IObjectActionDelegate {
/**
* See IActionDelegate#run(IAction).
*
- * @param action the action
+ * @param action
+ * the action
*/
@Override
public void run(IAction action) {
@@ -76,13 +78,9 @@ public class AddUimaNatureAction implements
IObjectActionDelegate {
if (currentProject != null) {
boolean addNature = false;
if (currentProject.hasNature(ProjectCustomizer.UIMA_NATURE_ID)) {
- addNature = MessageDialog
- .openQuestion(
- shell,
- "UIMA Nature",
- "The UIMA Nature was previously added to '"
- + currentProject.getName()
- + "'.\nWould you like to rebuild it without
overwriting existing files and folders?");
+ addNature = MessageDialog.openQuestion(shell, "UIMA Nature",
+ "The UIMA Nature was previously added to '" +
currentProject.getName()
+ + "'.\nWould you like to rebuild it without
overwriting existing files and folders?");
} else {
addNature = MessageDialog.openQuestion(shell, "Adding UIMA custom
Nature",
"Would you like to add a UIMA Nature to the project '" +
currentProject.getName()
@@ -126,8 +124,10 @@ public class AddUimaNatureAction implements
IObjectActionDelegate {
/**
* See IActionDelegate#selectionChanged(IAction, ISelection).
*
- * @param action the action
- * @param selection the selection
+ * @param action
+ * the action
+ * @param selection
+ * the selection
*/
@Override
public void selectionChanged(IAction action, ISelection selection) {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java
index 5be5395..6aa8001 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/EditInstallationDescriptorAction.java
@@ -31,7 +31,6 @@ import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
-
/**
*
* This class handles the "Edit Installation Descriptor" action, which appear
in the context menu of
@@ -54,8 +53,10 @@ public class EditInstallationDescriptorAction implements
IObjectActionDelegate {
/**
* Sets the active part.
*
- * @param action the action
- * @param targetPart the target part
+ * @param action
+ * the action
+ * @param targetPart
+ * the target part
* @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
*/
@Override
@@ -65,7 +66,8 @@ public class EditInstallationDescriptorAction implements
IObjectActionDelegate {
/**
* See IActionDelegate#run(IAction).
*
- * @param action the action
+ * @param action
+ * the action
*/
@Override
public void run(IAction action) {
@@ -76,8 +78,8 @@ public class EditInstallationDescriptorAction implements
IObjectActionDelegate {
IFile installFile = (IFile) ssel.getFirstElement();
// create the wizard
- EditInstallationDescriptorWizard wizard = new
EditInstallationDescriptorWizard(installFile
- .getProject());
+ EditInstallationDescriptorWizard wizard = new
EditInstallationDescriptorWizard(
+ installFile.getProject());
// Initialize the wizard
wizard.init(PlatformUI.getWorkbench(), ssel);
@@ -98,8 +100,10 @@ public class EditInstallationDescriptorAction implements
IObjectActionDelegate {
/**
* See IActionDelegate#selectionChanged(IAction, ISelection).
*
- * @param action the action
- * @param selection the selection
+ * @param action
+ * the action
+ * @param selection
+ * the selection
*/
@Override
public void selectionChanged(IAction action, ISelection selection) {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java
index 7455488..0d015a1 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/GeneratePearFileAction.java
@@ -38,7 +38,6 @@ import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
-
/**
*
* This class handles the "Generate PEAR" action, which appear in the context
menu of a project with
@@ -61,8 +60,10 @@ public class GeneratePearFileAction implements
IObjectActionDelegate {
/**
* Sets the active part.
*
- * @param action the action
- * @param targetPart the target part
+ * @param action
+ * the action
+ * @param targetPart
+ * the target part
* @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
*/
@Override
@@ -72,7 +73,8 @@ public class GeneratePearFileAction implements
IObjectActionDelegate {
/**
* See IActionDelegate#run(IAction).
*
- * @param action the action
+ * @param action
+ * the action
*/
@Override
public void run(IAction action) {
@@ -113,8 +115,10 @@ public class GeneratePearFileAction implements
IObjectActionDelegate {
/**
* See IActionDelegate#selectionChanged(IAction, ISelection).
*
- * @param action the action
- * @param selection the selection
+ * @param action
+ * the action
+ * @param selection
+ * the selection
*/
@Override
public void selectionChanged(IAction action, ISelection selection) {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
index 4f0dc71..d915de7 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/actions/PearProjectCustomizationException.java
@@ -47,7 +47,8 @@ public class PearProjectCustomizationException extends
Exception {
/**
* Instantiates a new pear project customization exception.
*
- * @param message the message
+ * @param message
+ * the message
*/
public PearProjectCustomizationException(String message) {
super(message);
@@ -56,7 +57,8 @@ public class PearProjectCustomizationException extends
Exception {
/**
* Instantiates a new pear project customization exception.
*
- * @param cause the cause
+ * @param cause
+ * the cause
*/
public PearProjectCustomizationException(Throwable cause) {
super(cause);
@@ -65,8 +67,10 @@ public class PearProjectCustomizationException extends
Exception {
/**
* Instantiates a new pear project customization exception.
*
- * @param message the message
- * @param cause the cause
+ * @param message
+ * the message
+ * @param cause
+ * the cause
*/
public PearProjectCustomizationException(String message, Throwable cause) {
super(message, cause);
@@ -83,18 +87,18 @@ public class PearProjectCustomizationException extends
Exception {
IStatus[] sa = new IStatus[o.length];
for (int i = 0; i < o.length; i++) {
sa[i] = (IStatus) o[i];
- }
+ }
return sa;
- }
- else {
- return new IStatus[0];
+ } else {
+ return new IStatus[0];
}
}
/**
* Gets the custom stack trace.
*
- * @param e the e
+ * @param e
+ * the e
* @return the custom stack trace
*/
synchronized ArrayList getCustomStackTrace(Throwable e) {
@@ -111,7 +115,7 @@ public class PearProjectCustomizationException extends
Exception {
Throwable aCause = e.getCause();
if (aCause != null) {
a.addAll(getCustomStackTrace(aCause));
- }
+ }
}
return a;
}
@@ -119,7 +123,8 @@ public class PearProjectCustomizationException extends
Exception {
/**
* Opens an Error dialog for this exception.
*
- * @param shell the shell
+ * @param shell
+ * the shell
*/
public void openErrorDialog(Shell shell) {
try {
@@ -128,8 +133,8 @@ public class PearProjectCustomizationException extends
Exception {
msg = msg == null ? "" : msg;
MultiStatus status = new MultiStatus(PLUGIN_ID, IStatus.ERROR,
getCustomStackTrace(), msg,
getCause());
- ErrorDialog.openError(shell, "Project Customization Error", getMessage()
- + " \nPlease see the details (below).", status, 0xFFFF);
+ ErrorDialog.openError(shell, "Project Customization Error",
+ getMessage() + " \nPlease see the details (below).", status,
0xFFFF);
} catch (Throwable th) {
th.printStackTrace();
}
@@ -138,8 +143,10 @@ public class PearProjectCustomizationException extends
Exception {
/**
* Opens an Error dialog for a given exception.
*
- * @param e A Throwable instance
- * @param shell Ashell
+ * @param e
+ * A Throwable instance
+ * @param shell
+ * Ashell
*/
public static void openErrorDialog(Throwable e, Shell shell) {
PearProjectCustomizationException subEx = new
PearProjectCustomizationException(
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java
index e1f8b68..2f3e356 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/GeneratePearWizard.java
@@ -45,7 +45,6 @@ import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-
/**
* Wizard to generate a PEAR file.
*
@@ -53,7 +52,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
*
*/
public class GeneratePearWizard extends Wizard implements IWizard,
InsdConstants {
-
+
/** The current container. */
private IContainer currentContainer;
@@ -77,7 +76,8 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
/**
* Constructor.
*
- * @param container the container
+ * @param container
+ * the container
*/
public GeneratePearWizard(IContainer container) {
try {
@@ -96,10 +96,9 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
AbstractUIPlugin plugin = PearPlugin.getDefault();
IDialogSettings workbenchSettings = plugin.getDialogSettings();
IDialogSettings section =
workbenchSettings.getSection("PearFileExportWizard");//$NON-NLS-1$
- if (section == null)
- {
+ if (section == null) {
section =
workbenchSettings.addNewSection("PearFileExportWizard");//$NON-NLS-1$
- }
+ }
setDialogSettings(section);
} catch (Throwable e) {
e.printStackTrace();
@@ -134,8 +133,8 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
environmentPage = new INSDEnvironmentPage(currentContainer, insd,
wizardData);
addPage(environmentPage);
- pearExportPage = new PearFileResourceExportPage(new
StructuredSelection(currentContainer
- .members()), currentContainer);
+ pearExportPage = new PearFileResourceExportPage(
+ new StructuredSelection(currentContainer.members()),
currentContainer);
addPage(pearExportPage);
} catch (Throwable e) {
@@ -158,9 +157,8 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
// currentContainer.refreshLocal(IResource.DEPTH_INFINITE,null);
editInstallationDescriptor();
final String file = pearExportPage.getDestinationValue();
- if (new File(file).exists()
- && !MessageDialog.openConfirm(getShell(), "File exists", "The
file " + file
- + " already exists. Do you want to overwrite it?")) {
+ if (new File(file).exists() && !MessageDialog.openConfirm(getShell(),
"File exists",
+ "The file " + file + " already exists. Do you want to overwrite
it?")) {
return false;
}
getContainer().run(false, true, pearExportPage.getExportRunnable());
@@ -175,8 +173,10 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
/**
* Edits the installation descriptor.
*
- * @throws CoreException the core exception
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws CoreException
+ * the core exception
+ * @throws IOException
+ * Signals that an I/O exception has occurred.
*/
private void editInstallationDescriptor() throws CoreException, IOException {
handleComponentInformation();
@@ -190,9 +190,8 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
*/
private void handleComponentInformation() {
insd.setMainComponent(componentPage.compID);
- insd
- .setMainComponentDesc(PearInstallationDescriptor
- .addMacro(componentPage.compDescriptorPath));
+ insd.setMainComponentDesc(
+
PearInstallationDescriptor.addMacro(componentPage.compDescriptorPath));
}
/**
@@ -205,12 +204,12 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
String os = environmentPage.osCombo.getText();
if (os != null && os.trim().length() > 0) {
- insd.addOSSpec(InstallationDescriptorHandler.NAME_TAG, os);
+ insd.addOSSpec(InstallationDescriptorHandler.NAME_TAG, os);
}
String jdkVersion = environmentPage.jdkVersionCombo.getText();
if (jdkVersion != null && jdkVersion.trim().length() > 0) {
- insd.addToolkitsSpec(InstallationDescriptorHandler.JDK_VERSION_TAG,
jdkVersion);
+ insd.addToolkitsSpec(InstallationDescriptorHandler.JDK_VERSION_TAG,
jdkVersion);
}
}
@@ -242,12 +241,14 @@ public class GeneratePearWizard extends Wizard implements
IWizard, InsdConstants
/**
* Inits the.
*
- * @param workbench the workbench
- * @param selection the selection
+ * @param workbench
+ * the workbench
+ * @param selection
+ * the selection
*/
/*
* @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
+ * org.eclipse.jface.viewers.IStructuredSelection)
*/
public void init(IWorkbench workbench, IStructuredSelection selection) {
// nothing to do
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java
index 41fcfd0..0f65817 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExport.java
@@ -23,7 +23,6 @@ import java.io.File;
import org.apache.uima.pear.PearException;
-
/**
* A util class for PEAR export operations.
*/
@@ -32,19 +31,21 @@ public class PearExport {
/**
* Ensure target file is valid.
*
- * @param targetFile the target file
+ * @param targetFile
+ * the target file
* @return true
- * @throws PearException -
+ * @throws PearException
+ * -
*/
protected boolean ensureTargetFileIsValid(File targetFile) throws
PearException {
if (targetFile.exists() && targetFile.isDirectory()) {
- throw new PearException("The target pear File must not be a directory",
new PearException(
- "The target pear File must not be a directory"));
+ throw new PearException("The target pear File must not be a directory",
+ new PearException("The target pear File must not be a
directory"));
}
if (targetFile.exists()) {
if (!targetFile.canWrite()) {
- throw new PearException("The pear File exists, but is not writable",
new PearException(
- "The pear File exists, but is not writable"));
+ throw new PearException("The pear File exists, but is not writable",
+ new PearException("The pear File exists, but is not
writable"));
}
}
return true;
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java
index 43fa935..4532307 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportMessages.java
@@ -23,7 +23,6 @@ import java.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-
/**
* Utility class which helps managing messages.
*/
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java
index d2e0ab7..2ad4b46 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearExportOperation.java
@@ -38,33 +38,36 @@ import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
-
/**
* {@link IRunnableWithProgress} that creates a zip file containing a given
set of resources *.
*/
public class PearExportOperation implements IRunnableWithProgress {
- /** An array of files that should be included in the zip file. */
+ /** An array of files that should be included in the zip file. */
protected final IFile[] fExports;
- /** Prefix to strip off from the provided files paths. */
+ /** Prefix to strip off from the provided files paths. */
protected final IContainer fRoot;
- /** Filename for the destination zip file. */
+ /** Filename for the destination zip file. */
protected final String fFilename;
- /** whether zip contents should be compressed. */
+ /** whether zip contents should be compressed. */
protected final boolean fCompress;
/**
* Constructor.
*
- * @param exports An array of files that should be included in the
zip file
- * @param virtualRoot Prefix to strip off from the provided files
paths, e.g. if '/foo/bar/baz.txt' is
+ * @param exports
+ * An array of files that should be included in the zip file
+ * @param virtualRoot
+ * Prefix to strip off from the provided files paths, e.g. if
'/foo/bar/baz.txt' is
* included and '/foo' is the virtual root, than '/bar/baz.txt'
will be created in the
* zip file
- * @param filename Filename for the destination zip file
- * @param compress <code>true</code> if the zip contents should be
compressed, <code>false</code>
+ * @param filename
+ * Filename for the destination zip file
+ * @param compress
+ * <code>true</code> if the zip contents should be compressed,
<code>false</code>
* otherwise
*/
public PearExportOperation(final IFile[] exports, final IContainer
virtualRoot,
@@ -78,11 +81,12 @@ public class PearExportOperation implements
IRunnableWithProgress {
/*
* (non-Javadoc)
*
- * @see
org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
+ * @see
org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.
+ * IProgressMonitor)
*/
@Override
- public void run(final IProgressMonitor monitor) throws
InvocationTargetException,
- InterruptedException {
+ public void run(final IProgressMonitor monitor)
+ throws InvocationTargetException, InterruptedException {
try {
final int SCALE = 100;
final String jobName = "Exporting " + fExports.length + " files to Pear
file " + fFilename
@@ -161,10 +165,13 @@ public class PearExportOperation implements
IRunnableWithProgress {
/**
* Read contents.
*
- * @param file The file to read
- * @param monitor the monitor
+ * @param file
+ * The file to read
+ * @param monitor
+ * the monitor
* @return A byte array with the file contents
- * @throws IOException -
+ * @throws IOException
+ * -
*/
private byte[] readContents(final IFile file, IProgressMonitor monitor)
throws IOException {
final ByteArrayOutputStream output = new ByteArrayOutputStream();
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java
index 019b91d..781d49b 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/generate/PearFileResourceExportPage.java
@@ -56,38 +56,39 @@ import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.model.WorkbenchViewerSorter;
-
/**
* Wizard page for exporting resource to a PEAR file.
*/
public class PearFileResourceExportPage extends WizardPage implements
InsdConstants {
- /** Preference store key for the last pear file export location. */
+ /** Preference store key for the last pear file export location. */
protected static final String PEAR_FILE = "pear_file"; //$NON-NLS-1$
- /** Plugins preference store. */
+ /** Plugins preference store. */
protected final IPreferenceStore fPreferenceStore;
- /** Folder or Project that contains the Pear structure. */
+ /** Folder or Project that contains the Pear structure. */
protected final IContainer fCurrentContainer;
- /** Initial selection for the TreeViewer. */
+ /** Initial selection for the TreeViewer. */
protected final IStructuredSelection fSelection;
- /** TreeViewer that shows resources to export. */
+ /** TreeViewer that shows resources to export. */
protected ContainerCheckedTreeViewer fTreeViewer;
- /** Text input for the. */
+ /** Text input for the. */
protected Text fDestinationFileInput;
- /** Checkbox for choosing whether pear file should be compressed. */
+ /** Checkbox for choosing whether pear file should be compressed. */
protected Button fCompressCheckbox;
/**
* constructor.
*
- * @param selection Initial selection for the export TreeViewer
- * @param currentContainer Container (project or folder) with Pear
structure
+ * @param selection
+ * Initial selection for the export TreeViewer
+ * @param currentContainer
+ * Container (project or folder) with Pear structure
*/
public PearFileResourceExportPage(final IStructuredSelection selection,
final IContainer currentContainer) {
@@ -131,8 +132,8 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
// If the file to export to exists, display an info stating that
if (new File(filename).exists()) {
setErrorMessage(null);
- setMessage(PearExportMessages.format(PearExportMessages
- .getString("PearFileResourceExportPage.FileExistsInfo"),
//$NON-NLS-1$
+ setMessage(PearExportMessages.format(
+
PearExportMessages.getString("PearFileResourceExportPage.FileExistsInfo"),
//$NON-NLS-1$
new Object[] { filename }), IMessageProvider.INFORMATION);
setPageComplete(true);
return;
@@ -163,7 +164,8 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
/**
* Checks if is metadata included.
*
- * @param checked the checked
+ * @param checked
+ * the checked
* @return <code>true</code> if all files in the metadata folder are
selected for export or the
* members cannot be determined, <code>false</code> otherwise
*/
@@ -207,7 +209,8 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
/**
* Stores the Pear filename in the preference store.
*
- * @param filename the filename
+ * @param filename
+ * the filename
*/
protected void saveDestinationValue(final String filename) {
fPreferenceStore.setValue(PEAR_FILE, filename);
@@ -251,7 +254,8 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
/**
* Create the options group with the compression checkbox.
*
- * @param parent the parent composite
+ * @param parent
+ * the parent composite
*/
protected void createOptionsGroup(final Composite parent) {
final Group group = new Group(parent, SWT.NONE);
@@ -261,15 +265,16 @@ public class PearFileResourceExportPage extends
WizardPage implements InsdConsta
fCompressCheckbox = new Button(group, SWT.CHECK);
fCompressCheckbox.setSelection(true);
- fCompressCheckbox.setText(PearExportMessages
- .getString("PearFileResourceExportPage.CompressContents"));
//$NON-NLS-1$
+ fCompressCheckbox
+
.setText(PearExportMessages.getString("PearFileResourceExportPage.CompressContents"));
//$NON-NLS-1$
}
/**
* Create the TreeViewer for selection of files to export in the Pear file
and select/deselect all
* buttons.
*
- * @param parent the parent composite
+ * @param parent
+ * the parent composite
*/
protected void createSourceControl(final Composite parent) {
final Composite container = new Composite(parent, SWT.NONE);
@@ -301,8 +306,8 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
});
final Button deselectAllButton = new Button(buttonsComposite, SWT.PUSH);
- deselectAllButton.setText(PearExportMessages
- .getString("PearFileResourceExportPage.DeselectAll"));
//$NON-NLS-1$
+ deselectAllButton
+
.setText(PearExportMessages.getString("PearFileResourceExportPage.DeselectAll"));
//$NON-NLS-1$
deselectAllButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -316,8 +321,10 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
/**
* Sets the all checked.
*
- * @param items A set of TreeItems that should be (un)checked,
including their children
- * @param checked <code>true</code> to check all items,
<code>false</code> to uncheck all items
+ * @param items
+ * A set of TreeItems that should be (un)checked, including their
children
+ * @param checked
+ * <code>true</code> to check all items, <code>false</code> to
uncheck all items
*/
protected void setAllChecked(final TreeItem[] items, final boolean checked) {
for (int i = 0; i < items.length; i++) {
@@ -353,8 +360,8 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
});
final Button destinationBrowseButton = new Button(container, SWT.PUSH);
- destinationBrowseButton.setText(PearExportMessages
- .getString("PearFileResourceExportPage.Browse")); //$NON-NLS-1$
+ destinationBrowseButton
+
.setText(PearExportMessages.getString("PearFileResourceExportPage.Browse"));
//$NON-NLS-1$
destinationBrowseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(final SelectionEvent e) {
@@ -366,7 +373,8 @@ public class PearFileResourceExportPage extends WizardPage
implements InsdConsta
/**
* Creates the tree viewer.
*
- * @param parent the parent composite
+ * @param parent
+ * the parent composite
* @return TreeViewer that shows uses Workbench Content- and LabelProvider
*/
protected ContainerCheckedTreeViewer createTreeViewer(Composite parent) {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java
index b02fa58..f7c811c 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/EditInstallationDescriptorWizard.java
@@ -37,7 +37,6 @@ import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.IWorkbench;
-
/**
* Wizard to edit the PEAR Installation Descriptor.
*
@@ -143,8 +142,10 @@ public class EditInstallationDescriptorWizard extends
Wizard implements IWizard,
/**
* Edits the installation descriptor.
*
- * @throws CoreException the core exception
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws CoreException
+ * the core exception
+ * @throws IOException
+ * Signals that an I/O exception has occurred.
*/
private void editInstallationDescriptor() throws CoreException, IOException {
handleComponentInformation();
@@ -158,9 +159,8 @@ public class EditInstallationDescriptorWizard extends
Wizard implements IWizard,
*/
private void handleComponentInformation() {
insd.setMainComponent(componentPage.compID);
- insd
- .setMainComponentDesc(PearInstallationDescriptor
- .addMacro(componentPage.compDescriptorPath));
+ insd.setMainComponentDesc(
+
PearInstallationDescriptor.addMacro(componentPage.compDescriptorPath));
}
/**
@@ -173,12 +173,12 @@ public class EditInstallationDescriptorWizard extends
Wizard implements IWizard,
String os = environmentPage.osCombo.getText();
if (os != null && os.trim().length() > 0) {
- insd.addOSSpec(InstallationDescriptorHandler.NAME_TAG, os);
+ insd.addOSSpec(InstallationDescriptorHandler.NAME_TAG, os);
}
String jdkVersion = environmentPage.jdkVersionCombo.getText();
if (jdkVersion != null && jdkVersion.trim().length() > 0) {
- insd.addToolkitsSpec(InstallationDescriptorHandler.JDK_VERSION_TAG,
jdkVersion);
+ insd.addToolkitsSpec(InstallationDescriptorHandler.JDK_VERSION_TAG,
jdkVersion);
}
}
@@ -210,8 +210,10 @@ public class EditInstallationDescriptorWizard extends
Wizard implements IWizard,
/**
* See IWorkbenchWizard#init(IWorkbench, IStructuredSelection).
*
- * @param workbench the workbench
- * @param selection the selection
+ * @param workbench
+ * the workbench
+ * @param selection
+ * the selection
*/
public void init(IWorkbench workbench, IStructuredSelection selection) {
// this.workbench = workbench;
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
index b9b0684..333bbc0 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDComponentPage.java
@@ -47,7 +47,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-
/**
* This is wizard page to edit UIMA component basic information.
*/
@@ -83,16 +82,20 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
/**
* Constructor.
*
- * @param currentContainer the current container
- * @param insd the insd
- * @param wizardData the wizard data
+ * @param currentContainer
+ * the current container
+ * @param insd
+ * the insd
+ * @param wizardData
+ * the wizard data
*/
public INSDComponentPage(IContainer currentContainer, InstallationDescriptor
insd,
Hashtable wizardData) {
super("wizardPage");
setTitle("UIMA - Installation Descriptor - Component Information");
- setDescription("Enter information about your UIMA component. The required
fields are indicated with a (*).\n"
- + "The descriptor must be specified using paths relative to the
project's root (e.g. \"desc/MyTAE.xml\").\n");
+ setDescription(
+ "Enter information about your UIMA component. The required fields
are indicated with a (*).\n"
+ + "The descriptor must be specified using paths relative
to the project's root (e.g. \"desc/MyTAE.xml\").\n");
this.wizardData = wizardData;
this.insd = insd;
this.currentContainer = currentContainer;
@@ -134,10 +137,9 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
temp = insd.getMainComponentId();
if (temp == null || temp.trim().length() == 0) {
- compID = currentContainer.getName();
- }
- else {
- compID = temp;
+ compID = currentContainer.getName();
+ } else {
+ compID = temp;
}
temp = insd.getMainComponentDesc();
@@ -148,10 +150,14 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
/**
* Adds the text field.
*
- * @param parent the parent
- * @param strLabel the str label
- * @param strText the str text
- * @param editable the editable
+ * @param parent
+ * the parent
+ * @param strLabel
+ * the str label
+ * @param strText
+ * the str text
+ * @param editable
+ * the editable
* @return the text
*/
public Text addTextField(Composite parent, String strLabel, String strText,
boolean editable) {
@@ -174,7 +180,8 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
/**
* See IDialogPage#createControl(Composite).
*
- * @param parent the parent
+ * @param parent
+ * the parent
*/
@Override
public void createControl(Composite parent) {
@@ -239,9 +246,8 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
setPageComplete(false);
setErrorMessage(null);
- }
- else {
- updateStatus(null);
+ } else {
+ updateStatus(null);
}
}
@@ -255,9 +261,8 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
setPageComplete(false);
setErrorMessage(null);
- }
- else {
- updateStatus(null);
+ } else {
+ updateStatus(null);
}
}
@@ -271,7 +276,8 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
/**
* Update status.
*
- * @param message the message
+ * @param message
+ * the message
*/
private void updateStatus(String message) {
@@ -302,16 +308,15 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
filename = filename.trim();
IFile iFile = currentContainer.getFile(new Path(filename));
if (!iFile.exists()) {
- sb.append("\n \"" + filename + "\" was not found in the current
project!");
- }
- else if (filename.trim().indexOf(".xml") == -1) {
- sb.append("\n \"" + filename + "\" is not an xml file!");
+ sb.append("\n \"" + filename + "\" was not found in the current
project!");
+ } else if (filename.trim().indexOf(".xml") == -1) {
+ sb.append("\n \"" + filename + "\" is not an xml file!");
}
}
}
String s = sb.toString();
if (s.length() > 0) {
- message = s;
+ message = s;
}
return message;
@@ -320,21 +325,26 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
/**
* Creates a new button
* <p>
- * The <code>Dialog</code> implementation of this framework method creates a
standard push
- * button, registers for selection events including button presses and
registers default buttons
- * with its shell. The button id is stored as the buttons client data. Note
that the parent's
- * layout is assumed to be a GridLayout and the number of columns in this
layout is incremented.
- * Subclasses may override.
+ * The <code>Dialog</code> implementation of this framework method creates a
standard push button,
+ * registers for selection events including button presses and registers
default buttons with its
+ * shell. The button id is stored as the buttons client data. Note that the
parent's layout is
+ * assumed to be a GridLayout and the number of columns in this layout is
incremented. Subclasses
+ * may override.
* </p>
*
- * @param parent the parent composite
- * @param label the label from the button
- * @param defaultButton <code>true</code> if the button is to be
the default button, and <code>false</code>
+ * @param parent
+ * the parent composite
+ * @param label
+ * the label from the button
+ * @param defaultButton
+ * <code>true</code> if the button is to be the default button, and
<code>false</code>
* otherwise
- * @param text the text
+ * @param text
+ * the text
* @return the button
*/
- protected Button addButton(Composite parent, String label, boolean
defaultButton, final Text text) {
+ protected Button addButton(Composite parent, String label, boolean
defaultButton,
+ final Text text) {
Button button = new Button(parent, SWT.PUSH);
button.setText(label);
@@ -373,9 +383,12 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
/**
* Creates a new Radio button.
*
- * @param parent the parent composite
- * @param label the label from the button
- * @param initialSelection <code>true</code> if the button is to be
the default button, and <code>false</code>
+ * @param parent
+ * the parent composite
+ * @param label
+ * the label from the button
+ * @param initialSelection
+ * <code>true</code> if the button is to be the default button, and
<code>false</code>
* otherwise
* @return the button
*/
@@ -396,14 +409,16 @@ public class INSDComponentPage extends WizardPage
implements InsdConstants {
return button;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
*/
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
- compIDText.setFocus();
+ compIDText.setFocus();
}
}
}
\ No newline at end of file
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java
index a6d0fb4..7efa6df 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/INSDEnvironmentPage.java
@@ -53,7 +53,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-
/**
* This is wizard page to edit PEAR Installation Environment parameters.
*/
@@ -90,9 +89,12 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Constructor.
*
- * @param currentContainer An IProject with the UIMA Nature
- * @param insd The installation Descriptor object
- * @param wizardData a hash table with shared information between
wizard pages
+ * @param currentContainer
+ * An IProject with the UIMA Nature
+ * @param insd
+ * The installation Descriptor object
+ * @param wizardData
+ * a hash table with shared information between wizard pages
*/
public INSDEnvironmentPage(IContainer currentContainer,
InstallationDescriptor insd,
Hashtable wizardData) {
@@ -108,7 +110,8 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* See IDialogPage#createControl(Composite).
*
- * @param parent the parent
+ * @param parent
+ * the parent
*/
@Override
public void createControl(Composite parent) {
@@ -163,7 +166,8 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Gets the first item.
*
- * @param tokens the tokens
+ * @param tokens
+ * the tokens
* @return the first item
*/
private String getFirstItem(String tokens) {
@@ -184,8 +188,10 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Adds the combo.
*
- * @param parent the parent
- * @param strLabel the str label
+ * @param parent
+ * the parent
+ * @param strLabel
+ * the str label
* @return the combo
*/
private Combo addCombo(Composite parent, String strLabel) {
@@ -215,9 +221,10 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
String selectedOS = "";
String selectedJdkVersion = "";
- selectedOS =
getFirstItem(insd.getOSSpecs().getProperty(InstallationDescriptorHandler.NAME_TAG));
- selectedJdkVersion = getFirstItem(insd.getToolkitsSpecs().getProperty(
- InstallationDescriptorHandler.JDK_VERSION_TAG));
+ selectedOS = getFirstItem(
+
insd.getOSSpecs().getProperty(InstallationDescriptorHandler.NAME_TAG));
+ selectedJdkVersion = getFirstItem(
+
insd.getToolkitsSpecs().getProperty(InstallationDescriptorHandler.JDK_VERSION_TAG));
String[] items = { "Windows", "Linux", "Windows and Linux", "AIX" };
String selectedItem = selectedOS;
@@ -281,7 +288,8 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Gets the initial class path.
*
- * @param classPath the class path
+ * @param classPath
+ * the class path
* @return the initial class path
*/
private String getInitialClassPath(String classPath) {
@@ -305,15 +313,14 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
addToClassPath(classPathEntries, resultStringEntries);
// add output Location
- System.out.println("Output Location (normal): "
- + javaProject.getOutputLocation().toOSString());
+ System.out.println(
+ "Output Location (normal): " +
javaProject.getOutputLocation().toOSString());
System.out.println("Output Location (relative): "
+ javaProject.getOutputLocation().makeRelative().toOSString());
System.out.println("Output Location (absolute): "
+ javaProject.getOutputLocation().makeAbsolute().toOSString());
- String outputLocation = "$main_root/"
- +
javaProject.getOutputLocation().makeRelative().removeFirstSegments(1)
- .toOSString();
+ String outputLocation = "$main_root/" +
javaProject.getOutputLocation().makeRelative()
+ .removeFirstSegments(1).toOSString();
outputLocation = outputLocation.replace('\\', '/');
outputLocation = outputLocation.trim();
System.out.println("Output Location (to class path): " +
outputLocation);
@@ -335,20 +342,14 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
Iterator itr = MissingLibraries.iterator();
while (itr.hasNext())
sb.append("\n- ").append((String) itr.next());
- MessageDialog
- .openWarning(
- getShell(),
- "Missing class path entries",
- "The following class path entries corresponds to
resources not included in your project. Please make sure all the required class
path resources (except JRE and UIMA jars) are included in this project and in
the PEAR class path (in the environment page of the wizard):"
- + sb.toString());
+ MessageDialog.openWarning(getShell(), "Missing class path entries",
+ "The following class path entries corresponds to resources
not included in your project. Please make sure all the required class path
resources (except JRE and UIMA jars) are included in this project and in the
PEAR class path (in the environment page of the wizard):"
+ + sb.toString());
}
}
} catch (Throwable e) {
- MessageDialog
- .openWarning(
- getShell(),
- "Class Path Initialization",
- "The class path could not be initialized properly.
Please edit the class path variable in the environment page of the wizard.");
+ MessageDialog.openWarning(getShell(), "Class Path Initialization",
+ "The class path could not be initialized properly. Please edit
the class path variable in the environment page of the wizard.");
e.printStackTrace();
}
@@ -358,7 +359,8 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Tokenize class path.
*
- * @param classPath the class path
+ * @param classPath
+ * the class path
* @return the array list
*/
/*
@@ -380,15 +382,18 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Adds the to class path.
*
- * @param classPathEntries the class path entries
- * @param resultStringEntries the result string entries
+ * @param classPathEntries
+ * the class path entries
+ * @param resultStringEntries
+ * the result string entries
* @return the array list
*/
/*
* Adds class path entries to a class path if not already included.
*
*/
- private ArrayList addToClassPath(IClasspathEntry[] classPathEntries,
ArrayList resultStringEntries) {
+ private ArrayList addToClassPath(IClasspathEntry[] classPathEntries,
+ ArrayList resultStringEntries) {
if (classPathEntries != null) {
for (int i = 0; i < classPathEntries.length; i++)
addToClassPath(classPathEntries[i], resultStringEntries);
@@ -399,8 +404,10 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Convert to string.
*
- * @param stringEntries the string entries
- * @param delim the delim
+ * @param stringEntries
+ * the string entries
+ * @param delim
+ * the delim
* @return the string
*/
/*
@@ -418,8 +425,10 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Adds the to class path.
*
- * @param classPathEntry the class path entry
- * @param classPath the class path
+ * @param classPathEntry
+ * the class path entry
+ * @param classPath
+ * the class path
* @return the array list
*/
/*
@@ -439,11 +448,11 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
switch (kind) {
case IClasspathEntry.CPE_LIBRARY:
path = classPathEntry.getPath();
- boolean inProject =
currentContainer.getFullPath().makeAbsolute().isPrefixOf(
- path.makeAbsolute());
+ boolean inProject = currentContainer.getFullPath().makeAbsolute()
+ .isPrefixOf(path.makeAbsolute());
- System.out.println("\tProject (full absolute): "
- + currentContainer.getFullPath().makeAbsolute());
+ System.out.println(
+ "\tProject (full absolute): " +
currentContainer.getFullPath().makeAbsolute());
System.out.println(inProject ? "\tinProject" : "Not in Project");
String temp = "";
@@ -478,8 +487,10 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Contain.
*
- * @param classPath the class path
- * @param classPathEntryString the class path entry string
+ * @param classPath
+ * the class path
+ * @param classPathEntryString
+ * the class path entry string
* @return true, if successful
*/
/*
@@ -518,7 +529,8 @@ public class INSDEnvironmentPage extends WizardPage
implements InsdConstants {
/**
* Update status.
*
- * @param message the message
+ * @param message
+ * the message
*/
private void updateStatus(String message) {
setErrorMessage(message);
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java
index dd041d6..d391482 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/InsdConstants.java
@@ -19,7 +19,6 @@
package org.apache.uima.pear.insd.edit;
-
/**
*
* this interface defines common constants used in classes related to handling
PEAR Installation
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java
index 9958a54..63f51e4 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/PearInstallationDescriptor.java
@@ -32,7 +32,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.xml.sax.SAXException;
-
/**
*
* Handles the PEAR installation descriptor (install.xml)
@@ -48,10 +47,14 @@ public class PearInstallationDescriptor {
/**
* Save installation descriptor.
*
- * @param currentContainer An IProject with the UIMA nature
- * @param insd The installation descriptor object
- * @throws CoreException if there is problem accessing the
corresponding resource
- * @throws IOException if there is problem writing to the
corresponding resource
+ * @param currentContainer
+ * An IProject with the UIMA nature
+ * @param insd
+ * The installation descriptor object
+ * @throws CoreException
+ * if there is problem accessing the corresponding resource
+ * @throws IOException
+ * if there is problem writing to the corresponding resource
*/
public static void saveInstallationDescriptor(IContainer currentContainer,
InstallationDescriptor insd) throws CoreException, IOException {
@@ -120,7 +123,8 @@ public class PearInstallationDescriptor {
/**
* adds the $main_root/ macro as a prefix to the given string.
*
- * @param s a String representing a relative path to the project
root
+ * @param s
+ * a String representing a relative path to the project root
* @return The String with the macro
*/
public static String addMacro(String s) {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
index 1ccd307..874e28f 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/AbstractVarValViewerHandler.java
@@ -74,11 +74,16 @@ abstract class AbstractVarValViewerHandler {
/**
* Instantiates a new abstract var val viewer handler.
*
- * @param parent the parent
- * @param columnNames the column names
- * @param numParentColumns the num parent columns
- * @param tableRowList the table row list
- * @param labelProvider the label provider
+ * @param parent
+ * the parent
+ * @param columnNames
+ * the column names
+ * @param numParentColumns
+ * the num parent columns
+ * @param tableRowList
+ * the table row list
+ * @param labelProvider
+ * the label provider
*/
public AbstractVarValViewerHandler(Composite parent, String[] columnNames,
int numParentColumns,
VarValList tableRowList, ITableLabelProvider labelProvider) {
@@ -126,8 +131,10 @@ abstract class AbstractVarValViewerHandler {
/**
* Create a new shell, add the widgets, open the shell.
*
- * @param composite the composite
- * @param numColumns the num columns
+ * @param composite
+ * the composite
+ * @param numColumns
+ * the num columns
*/
protected void addChildControls(Composite composite, int numColumns) {
@@ -152,7 +159,8 @@ abstract class AbstractVarValViewerHandler {
/**
* Create the Table.
*
- * @param parent the parent
+ * @param parent
+ * the parent
*/
protected void createTable(Composite parent) {
int style = SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL |
SWT.FULL_SELECTION
@@ -200,7 +208,7 @@ abstract class AbstractVarValViewerHandler {
Shell shell = table.getShell();
if (shell != null && !shell.isDisposed()) {
- shell.dispose();
+ shell.dispose();
}
}
@@ -211,20 +219,26 @@ abstract class AbstractVarValViewerHandler {
*/
class ExampleContentProvider implements IStructuredContentProvider,
IVarValListViewer {
- /* (non-Javadoc)
- * @see
org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
java.lang.Object, java.lang.Object)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ *
org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
+ * java.lang.Object, java.lang.Object)
*/
@Override
public void inputChanged(Viewer v, Object oldInput, Object newInput) {
if (newInput != null) {
((VarValList) newInput).addChangeListener(this);
- }
+ }
if (oldInput != null) {
((VarValList) oldInput).removeChangeListener(this);
- }
+ }
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
@Override
@@ -232,7 +246,9 @@ abstract class AbstractVarValViewerHandler {
tableRowList.removeChangeListener(this);
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
// Return the tableRows as an array of Objects
@@ -275,7 +291,8 @@ abstract class AbstractVarValViewerHandler {
/**
* Add the "Add", "Delete" and "Close" buttons.
*
- * @param parent the parent composite
+ * @param parent
+ * the parent composite
*/
protected void createButtons(Composite parent) {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java
index 060ed24..f67878f 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/IVarValListViewer.java
@@ -19,7 +19,6 @@
package org.apache.uima.pear.insd.edit.vars;
-
/**
* The Interface IVarValListViewer.
*/
@@ -28,21 +27,24 @@ interface IVarValListViewer {
/**
* Update the view to reflect the fact that a VarVal was added to the VarVal
list.
*
- * @param tableRow the table row
+ * @param tableRow
+ * the table row
*/
void addTableRow(VarVal tableRow);
/**
* Update the view to reflect the fact that a VarVal was removed from the
VarVal list.
*
- * @param tableRow the table row
+ * @param tableRow
+ * the table row
*/
void removeTableRow(VarVal tableRow);
/**
* Update the view to reflect the fact that one of the TableRows was
modified.
*
- * @param tableRow the table row
+ * @param tableRow
+ * the table row
*/
void updateTableRow(VarVal tableRow);
}
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
index b983bbd..7f8c2b6 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarVal.java
@@ -19,7 +19,6 @@
package org.apache.uima.pear.insd.edit.vars;
-
/**
* Represents a table row in a two column table (of environment variables).
*/
@@ -45,8 +44,10 @@ public class VarVal {
/**
* Create a VarVal instance.
*
- * @param varName the var name
- * @param varValue the var value
+ * @param varName
+ * the var name
+ * @param varValue
+ * the var value
*/
public VarVal(String varName, String varValue) {
this.varName = varName;
@@ -83,7 +84,8 @@ public class VarVal {
/**
* Sets the variable name.
*
- * @param string the variable name
+ * @param string
+ * the variable name
*/
public void setVarName(String string) {
varName = string;
@@ -92,7 +94,8 @@ public class VarVal {
/**
* Sets the variable value.
*
- * @param string the variable value
+ * @param string
+ * the variable value
*/
public void setVarValue(String string) {
varValue = string;
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java
index 2f6f042..4eaab18 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValCellModifier.java
@@ -22,13 +22,12 @@ package org.apache.uima.pear.insd.edit.vars;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.swt.widgets.TableItem;
-
/**
* This class implements an ICellModifier An ICellModifier is called when the
user modifes a cell in
* the tableViewer.
*/
class VarValCellModifier implements ICellModifier {
-
+
/** The table viewer example. */
private VarValViewerHandler tableViewerExample;
@@ -38,9 +37,12 @@ class VarValCellModifier implements ICellModifier {
/**
* Constructor.
*
- * @param tableViewerExample the table viewer example
- * @param columnNames the column names
- * @param tableRowList the table row list
+ * @param tableViewerExample
+ * the table viewer example
+ * @param columnNames
+ * the column names
+ * @param tableRowList
+ * the table row list
*/
public VarValCellModifier(VarValViewerHandler tableViewerExample, String[]
columnNames,
VarValList tableRowList) {
@@ -51,8 +53,10 @@ class VarValCellModifier implements ICellModifier {
/**
* Can modify.
*
- * @param element the element
- * @param property the property
+ * @param element
+ * the element
+ * @param property
+ * the property
* @return true, if successful
* @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object,
java.lang.String)
*/
@@ -64,8 +68,10 @@ class VarValCellModifier implements ICellModifier {
/**
* Gets the value.
*
- * @param element the element
- * @param property the property
+ * @param element
+ * the element
+ * @param property
+ * the property
* @return the value
* @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object,
java.lang.String)
*/
@@ -94,9 +100,12 @@ class VarValCellModifier implements ICellModifier {
/**
* Modify.
*
- * @param element the element
- * @param property the property
- * @param value the value
+ * @param element
+ * the element
+ * @param property
+ * the property
+ * @param value
+ * the value
* @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object,
java.lang.String,
* java.lang.Object)
*/
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java
index 9611e75..2c70151 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValLabelProvider.java
@@ -23,7 +23,6 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
-
/**
* Label provider for the VarValViewerHandler.
*
@@ -34,8 +33,10 @@ class VarValLabelProvider extends LabelProvider implements
ITableLabelProvider {
/**
* Gets the column text.
*
- * @param element the element
- * @param columnIndex the column index
+ * @param element
+ * the element
+ * @param columnIndex
+ * the column index
* @return the column text
* @see
org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
int)
*/
@@ -59,8 +60,10 @@ class VarValLabelProvider extends LabelProvider implements
ITableLabelProvider {
/**
* Gets the column image.
*
- * @param element the element
- * @param columnIndex the column index
+ * @param element
+ * the element
+ * @param columnIndex
+ * the column index
* @return the column image
* @see
org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
int)
*/
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
index 8317ea9..10a9df4 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValList.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
import java.util.Set;
import java.util.Vector;
-
/**
* Represents a list of environment variable to be displayed in a table.
*/
@@ -64,16 +63,16 @@ public class VarValList {
/**
* Adds a new table Row.
*
- * @param tableRow the table row
+ * @param tableRow
+ * the table row
* @return true, if successful
*/
public boolean addTableRow(VarVal tableRow) {
if (!isDuplicate(tableRow)) {
tableRows.add(tableRow);
return true;
- }
- else {
- return false;
+ } else {
+ return false;
}
}
@@ -89,18 +88,18 @@ public class VarValList {
Iterator iterator = changeListeners.iterator();
while (iterator.hasNext()) {
((IVarValListViewer) iterator.next()).addTableRow(tableRow);
- }
+ }
return true;
- }
- else {
- return false;
+ } else {
+ return false;
}
}
/**
* Checks if is duplicate.
*
- * @param tableRow the table row
+ * @param tableRow
+ * the table row
* @return true, if is duplicate
*/
private boolean isDuplicate(VarVal tableRow) {
@@ -111,7 +110,7 @@ public class VarValList {
VarVal vv = (VarVal) itr.next();
if (vv.getVarName().equals(varName)) {
duplicate = true;
- }
+ }
}
return duplicate;
}
@@ -119,32 +118,35 @@ public class VarValList {
/**
* Removes the table row.
*
- * @param tableRow the table row
+ * @param tableRow
+ * the table row
*/
public void removeTableRow(VarVal tableRow) {
tableRows.remove(tableRow);
Iterator iterator = changeListeners.iterator();
while (iterator.hasNext()) {
- ((IVarValListViewer) iterator.next()).removeTableRow(tableRow);
+ ((IVarValListViewer) iterator.next()).removeTableRow(tableRow);
}
}
/**
* Notify listeners by calling their updateTableRow() method.
*
- * @param tableRow the table row
+ * @param tableRow
+ * the table row
*/
public void tableRowChanged(VarVal tableRow) {
Iterator iterator = changeListeners.iterator();
while (iterator.hasNext()) {
- ((IVarValListViewer) iterator.next()).updateTableRow(tableRow);
+ ((IVarValListViewer) iterator.next()).updateTableRow(tableRow);
}
}
/**
* Removes a Change Listener.
*
- * @param viewer A Chnage listener
+ * @param viewer
+ * A Chnage listener
*/
public void removeChangeListener(IVarValListViewer viewer) {
changeListeners.remove(viewer);
@@ -153,7 +155,8 @@ public class VarValList {
/**
* Adds a change listener.
*
- * @param viewer the viewer
+ * @param viewer
+ * the viewer
*/
public void addChangeListener(IVarValListViewer viewer) {
changeListeners.add(viewer);
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java
index 20303e9..4d8c33c 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValSorter.java
@@ -22,7 +22,6 @@ package org.apache.uima.pear.insd.edit.vars;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
-
/**
* This sorter supports three sort criteria:
* <p>
@@ -30,7 +29,8 @@ import org.eclipse.jface.viewers.ViewerSorter;
* </p>
* <p>
* <code>VAR_VALUE</code>: (String)
- * </p>.
+ * </p>
+ * .
*/
class VarValSorter extends ViewerSorter {
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java
index c6318e5..444d034 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/insd/edit/vars/VarValViewerHandler.java
@@ -29,7 +29,6 @@ import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TableColumn;
-
/**
* Handles the display and management of an environment variables table.
*/
@@ -38,17 +37,23 @@ public class VarValViewerHandler extends
AbstractVarValViewerHandler {
/**
* Instantiates a new var val viewer handler.
*
- * @param parent the parent
- * @param columnNames the column names
- * @param numParentColumns the num parent columns
- * @param tableRowList the table row list
+ * @param parent
+ * the parent
+ * @param columnNames
+ * the column names
+ * @param numParentColumns
+ * the num parent columns
+ * @param tableRowList
+ * the table row list
*/
public VarValViewerHandler(Composite parent, String[] columnNames, int
numParentColumns,
VarValList tableRowList) {
super(parent, columnNames, numParentColumns, tableRowList, new
VarValLabelProvider());
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.apache.uima.pear.insd.edit.vars.AbstractVarValViewerHandler#createCellModifiers()
*/
@Override
@@ -56,7 +61,9 @@ public class VarValViewerHandler extends
AbstractVarValViewerHandler {
return new VarValCellModifier(this, columnNames, tableRowList);
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.apache.uima.pear.insd.edit.vars.AbstractVarValViewerHandler#createSorter()
*/
@Override
@@ -64,7 +71,9 @@ public class VarValViewerHandler extends
AbstractVarValViewerHandler {
return new VarValSorter(VarValSorter.VAR_NAME);
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.apache.uima.pear.insd.edit.vars.AbstractVarValViewerHandler#createTableColumns()
*/
@Override
@@ -95,7 +104,9 @@ public class VarValViewerHandler extends
AbstractVarValViewerHandler {
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.apache.uima.pear.insd.edit.vars.AbstractVarValViewerHandler#createCellEditors()
*/
@Override
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java
index 00c5251..3f9308b 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/ProjectCustomizer.java
@@ -188,7 +188,8 @@ public class ProjectCustomizer {
is = new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8));
return createFile(project, fileName, is, overrideContentIfExist);
} catch (Throwable e) {
- PearException subEx = new PearException(fileName + " could not be
created/saved properly.", e);
+ PearException subEx = new PearException(fileName + " could not be
created/saved properly.",
+ e);
throw subEx;
}
}
@@ -230,7 +231,8 @@ public class ProjectCustomizer {
// return null as there is no container to place a file in
return null;
} catch (Throwable e) {
- PearException subEx = new PearException(fileName + " could not be
created/saved properly.", e);
+ PearException subEx = new PearException(fileName + " could not be
created/saved properly.",
+ e);
throw subEx;
}
}
diff --git
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java
index 1dd06ef..3081cd7 100644
---
a/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java
+++
b/uimaj-ep-pear-packager/src/main/java/org/apache/uima/pear/nature/UimaNature.java
@@ -45,8 +45,8 @@ public class UimaNature implements IProjectNature {
ProjectCustomizer.customizeProject(project);
} catch (PearException e) {
e.printStackTrace();
-
e.openErrorDialog(PearPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow()
- .getShell());
+ e.openErrorDialog(
+
PearPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell());
}
}
