Author: hibou
Date: Sun Aug 30 15:49:09 2009
New Revision: 809362
URL: http://svn.apache.org/viewvc?rev=809362&view=rev
Log:
some clean up regarding errors reported by checkstyle: unused import, line too
long, maic number, unsued code, undocumented code, etc...
Removed:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/FileExtFilter.java
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/IPackageFragmentExtraInfo.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ConfTableViewer.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/ConsoleDocument.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleRemoveAction.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLTagScanner.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/IvyDEStrategy.java
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF Sun Aug
30 15:49:09 2009
@@ -6,7 +6,6 @@
Bundle-ClassPath: ivyde-eclipse.jar
Bundle-Activator: org.apache.ivyde.eclipse.IvyPlugin
Bundle-Vendor: Apache Software Foundation
-Bundle-Localization: plugin
Export-Package: org.apache.ivyde.eclipse,
org.apache.ivyde.eclipse.cpcontainer,
org.apache.ivyde.eclipse.cpcontainer.fragmentinfo,
@@ -35,4 +34,5 @@
org.apache.ivy,
org.eclipse.help,
org.eclipse.wst.xml.core
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/build.properties Sun Aug 30
15:49:09 2009
@@ -16,7 +16,8 @@
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
-source.ivyde-eclipse.jar = src/java/
+source.ivyde-eclipse.jar = src/java/,\
+ test/java/
output.ivyde-eclipse.jar = bin/
bin.includes = plugin.xml,\
ivyde-eclipse.jar,\
@@ -40,7 +41,5 @@
.project,\
.classpath,\
.settings/,\
- IvyDE.launch,\
META-INF/,\
- CHANGES.txt,\
xsd/
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/completion/IvyCodeCompletionProcessor.java
Sun Aug 30 15:49:09 2009
@@ -92,7 +92,8 @@
// Loop through all proposals
for (Iterator iter = atts.iterator(); iter.hasNext();) {
IvyTagAttribute att = (IvyTagAttribute) iter.next();
- if (att.getName().startsWith(qualifier) &&
!existingAtts.containsKey(att.getName())) {
+ if (att.getName().startsWith(qualifier)
+ && !existingAtts.containsKey(att.getName())) {
// Yes -- compute whole proposal text
String text = att.getName() + "=\"\"";
// Construct proposal
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyModuleDescriptorModel.java
Sun Aug 30 15:49:09 2009
@@ -627,13 +627,11 @@
new ListValueProvider(getDefault("ext"))));
exclude.addAttribute(new IvyTagAttribute("matcher",
"the matcher to use to match the modules to include", false,
matcherNamesProvider));
- exclude
- .addAttribute(new IvyTagAttribute(
- "conf",
- "comma separated list of the master configurations \n"
- + "in which this artifact should be excluded.
\n"
- + "'*' wildcard can be used to designate all
configurations of this module",
- false, masterConfsValueProvider));
+ exclude.addAttribute(new IvyTagAttribute("conf",
+ "comma separated list of the master configurations \n"
+ + "in which this artifact should be excluded. \n"
+ + "'*' wildcard can be used to designate all
configurations of"
+ + " this module", false, masterConfsValueProvider));
IvyTag conf6 = new IvyTag("conf", "configuration in which the artifact
should be excluded");
conf6.addAttribute(new IvyTagAttribute("name",
"the name of the master configuration in which \n"
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainer.java
Sun Aug 30 15:49:09 2009
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.text.ParseException;
import java.util.Arrays;
import java.util.Comparator;
@@ -85,7 +84,6 @@
* @param classpathEntries
* the entries to start with
* @throws IOException
- * @throws ParseException
* @throws MalformedURLException
*/
public IvyClasspathContainer(IJavaProject javaProject, IPath path,
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathUtil.java
Sun Aug 30 15:49:09 2009
@@ -103,7 +103,8 @@
* the project to search into
* @return the Ivy classpath container if found
*/
- public static List/*<IvyClasspathContainer>*/
getIvyClasspathContainers(IJavaProject javaProject) {
+ public static List/* <IvyClasspathContainer> */getIvyClasspathContainers(
+ IJavaProject javaProject) {
List/*<IvyClasspathContainer>*/ containers = new ArrayList();
try {
IClasspathEntry[] entries = javaProject.getRawClasspath();
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyResolveJob.java
Sun Aug 30 15:49:09 2009
@@ -198,7 +198,8 @@
Thread.currentThread().setContextClassLoader(IvyResolveJob.class.getClassLoader());
try {
this.ivy = conf.getIvy();
- // IVYDE-168 : Ivy needs the IvyContext in the threadlocal in
order to found the default branch
+ // IVYDE-168 : Ivy needs the IvyContext in the threadlocal in
order to found the
+ // default branch
ivy.pushContext();
this.md = conf.getModuleDescriptor(ivy);
} catch (IvyDEException e) {
@@ -550,7 +551,8 @@
}
// we haven't found source artifact in resolved artifacts,
// let's look in the module declaring the artifact
- Artifact[] artifacts = (Artifact[])
artifactsByDependency.get(artifact.getId().getModuleRevisionId());
+ ModuleRevisionId mrid = artifact.getId().getModuleRevisionId();
+ Artifact[] artifacts = (Artifact[]) artifactsByDependency.get(mrid);
if (artifacts != null) {
for (int i = 0; i < artifacts.length; i++) {
Artifact metaArtifact = artifacts[i];
@@ -584,7 +586,8 @@
}
// we haven't found javadoc artifact in resolved artifacts,
// let's look in the module declaring the artifact
- Artifact[] artifacts = (Artifact[])
artifactsByDependency.get(artifact.getId().getModuleRevisionId());
+ ModuleRevisionId mrid = artifact.getId().getModuleRevisionId();
+ Artifact[] artifacts = (Artifact[]) artifactsByDependency.get(mrid);
if (artifacts != null) {
for (int i = 0; i < artifacts.length; i++) {
Artifact metaArtifact = artifacts[i];
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/IPackageFragmentExtraInfo.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/IPackageFragmentExtraInfo.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/IPackageFragmentExtraInfo.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/IPackageFragmentExtraInfo.java
Sun Aug 30 15:49:09 2009
@@ -34,5 +34,5 @@
public void setSourceAttachmentRootPath(IPath containerPath, String
entryPath, IPath rootPath);
- public void setJavaDocLocation(IPath containerPath, String entryPath, URL
libraryJavadocLocation);
+ public void setJavaDocLocation(IPath containerPath, String entryPath, URL
libraryJavadocLoc);
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
Sun Aug 30 15:49:09 2009
@@ -33,17 +33,17 @@
public static final String TOOLTIP_ACCEPTED_TYPES = "Comma separated list
of artifact types"
+ " to use in IvyDE Managed Dependencies Library.\n" + "Example:
jar, zip";
- public static final String TOOLTIP_SOURCE_TYPES = "Comma separated list of
artifact types to be used as sources.\n"
- + "Example: source, src";
+ public static final String TOOLTIP_SOURCE_TYPES = "Comma separated list of
artifact types to"
+ + " be used as sources.\nExample: source, src";
- public static final String TOOLTIP_JAVADOC_TYPES = "Comma separated list
of artifact types to be used as javadoc.\n"
- + "Example: javadoc.";
+ public static final String TOOLTIP_JAVADOC_TYPES = "Comma separated list
of artifact types to"
+ + " be used as javadoc.\nExample: javadoc.";
- public static final String TOOLTIP_SOURCE_SUFFIXES = "Comma separated list
of suffixes to match sources to artifacts.\n"
- + "Example: -source, -src";
+ public static final String TOOLTIP_SOURCE_SUFFIXES = "Comma separated list
of suffixes to match"
+ + " sources to artifacts.\nExample: -source, -src";
- public static final String TOOLTIP_JAVADOC_SUFFIXES = "Comma separated
list of suffixes to match javadocs to artifacts.\n"
- + "Example: -javadoc, -doc";
+ public static final String TOOLTIP_JAVADOC_SUFFIXES = "Comma separated
list of suffixes to"
+ + " match javadocs to artifacts.\nExample: -javadoc, -doc";
private Text acceptedTypesText;
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ConfTableViewer.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ConfTableViewer.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ConfTableViewer.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ConfTableViewer.java
Sun Aug 30 15:49:09 2009
@@ -65,10 +65,12 @@
new GridData(GridData.FILL, GridData.FILL, true, true));
TableColumn col1 = new TableColumn(confTableViewer.getTable(),
SWT.NONE);
col1.setText("Name");
+ // CheckStyle:MagicNumber| OFF
col1.setWidth(100);
TableColumn col2 = new TableColumn(confTableViewer.getTable(),
SWT.NONE);
col2.setText("Description");
col2.setWidth(300);
+ // CheckStyle:MagicNumber| ON
confTableViewer.setColumnProperties(new String[] {"Name",
"Description"});
confTableViewer.getTable().setLayoutData(
new GridData(GridData.FILL, GridData.FILL, true, true));
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/IvyFilePathText.java
Sun Aug 30 15:49:09 2009
@@ -36,8 +36,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -193,6 +191,7 @@
dialog.setTitle("choose ivy file");
dialog.setMessage("choose the ivy file to use to resolve
dependencies");
dialog.setInput(project.getProject());
+ // deprecated use as of 3.3 but we need to say compatible with
3.2
dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
if (dialog.open() == Window.OK) {
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/RetrieveComposite.java
Sun Aug 30 15:49:09 2009
@@ -33,11 +33,11 @@
+ "To copy artifacts in folder named lib without revision by
folder"
+ " named like configurations";
- public static final String TOOLTIP_RETRIEVE_CONFS = "Comma separated list
of configuration to retrieve\n"
- +"Exemple: '*' or 'compile,test'";
+ public static final String TOOLTIP_RETRIEVE_CONFS = "Comma separated list
of configuration to"
+ + " retrieve\nExemple: '*' or 'compile,test'";
- public static final String TOOLTIP_RETRIEVE_TYPES = "Comma separated list
of types to retrieve\n"
- +"Exemple: '*' or 'jar,source'";
+ public static final String TOOLTIP_RETRIEVE_TYPES = "Comma separated list
of types to retrieve"
+ + "\nExemple: '*' or 'jar,source'";
private Button doRetrieveButton;
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
Sun Aug 30 15:49:09 2009
@@ -71,7 +71,9 @@
public SettingsEditor(Composite parent, int style) {
super(parent, style);
+ // CheckStyle:MagicNumber| OFF
GridLayout layout = new GridLayout(3, false);
+ // CheckStyle:MagicNumber| ON
layout.marginHeight = 0;
layout.marginWidth = 0;
setLayout(layout);
@@ -133,7 +135,10 @@
loadOnDemandButton = new Button(this, SWT.CHECK);
loadOnDemandButton.setText("reload the settings only on demand");
- loadOnDemandButton.setLayoutData(new GridData(GridData.FILL,
GridData.FILL, true, false, 3, 1));
+ // CheckStyle:MagicNumber| OFF
+ loadOnDemandButton.setLayoutData(new GridData(GridData.FILL,
GridData.FILL, true, false, 3,
+ 1));
+ // CheckStyle:MagicNumber| ON
label = new Label(this, SWT.NONE);
label.setText("Property files:");
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/ConsoleDocument.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/ConsoleDocument.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/ConsoleDocument.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/ConsoleDocument.java
Sun Aug 30 15:49:09 2009
@@ -30,20 +30,29 @@
private static final int BUFFER_SIZE = 200;
protected static class ConsoleLine {
- public String line;
+ private String line;
- public int type;
+ private int type;
ConsoleLine(String line, int type) {
this.line = line;
this.type = type;
}
+
+ public String getLine() {
+ return line;
+ }
+
+ public int getType() {
+ return type;
+ }
}
/**
* Creates an empty console document.
*/
public ConsoleDocument() {
+ // nothing to initialize
}
/**
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java
Sun Aug 30 15:49:09 2009
@@ -25,7 +25,6 @@
import org.apache.ivy.util.MessageLoggerHelper;
import org.apache.ivyde.eclipse.IvyPlugin;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
@@ -51,7 +50,9 @@
public static final String PREF_CONSOLE_ERROR_COLOR = IvyPlugin.ID +
".console.color.error";
+ // CheckStyle:MagicNumber| OFF
private MessageConsoleStream[] streams = new MessageConsoleStream[5];
+ // CheckStyle:MagicNumber| ON
private ConsoleDocument document;
@@ -160,7 +161,7 @@
ConsoleDocument.ConsoleLine[] lines = document.getLines();
for (int i = 0; i < lines.length; i++) {
ConsoleDocument.ConsoleLine line = lines[i];
- appendLine(line.type, line.line);
+ appendLine(line.getType(), line.getLine());
}
document.clear();
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleRemoveAction.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleRemoveAction.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleRemoveAction.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsoleRemoveAction.java
Sun Aug 30 15:49:09 2009
@@ -22,11 +22,11 @@
public class IvyConsoleRemoveAction extends CloseConsoleAction {
- public IvyConsoleRemoveAction(IConsole console) {
+ public IvyConsoleRemoveAction(IConsole console) {
super(console);
}
public void run() {
- IvyConsoleFactory.closeConsole();
- }
+ IvyConsoleFactory.closeConsole();
+ }
}
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvyModuleDescriptorEditor.java
Sun Aug 30 15:49:09 2009
@@ -73,7 +73,7 @@
IvyFileEditorInput ivyFileEditorInput = null;
if (input instanceof FileEditorInput) {
FileEditorInput fei = (FileEditorInput) input;
- IFile file = ((FileEditorInput) input).getFile();
+ IFile file = fei.getFile();
ivyFileEditorInput = new IvyFileEditorInput(file);
} else if (input instanceof IvyFileEditorInput) {
ivyFileEditorInput = (IvyFileEditorInput) input;
@@ -84,8 +84,7 @@
xmlEditor.setFile(ivyFileEditorInput.getFile());
}
}
- // deprectated but we need retro compatibility
- setTitle(ivyFileEditorInput.getFile().getName());
+ setPartName(ivyFileEditorInput.getFile().getName());
}
void createPageXML() {
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/IvySettingsEditor.java
Sun Aug 30 15:49:09 2009
@@ -64,7 +64,7 @@
IvyFileEditorInput ivyFileEditorInput = null;
if (input instanceof FileEditorInput) {
FileEditorInput fei = (FileEditorInput) input;
- IFile file = ((FileEditorInput) input).getFile();
+ IFile file = fei.getFile();
ivyFileEditorInput = new IvyFileEditorInput(file);
} else if (input instanceof IvyFileEditorInput) {
ivyFileEditorInput = (IvyFileEditorInput) input;
@@ -75,8 +75,7 @@
xmlEditor.setFile(ivyFileEditorInput.getFile());
}
}
- // deprectated but we need retro compatibility
- setTitle(ivyFileEditorInput.getFile().getName());
+ setPartName(ivyFileEditorInput.getFile().getName());
}
void createPageXML() {
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/NonRuleBasedDamagerRepairer.java
Sun Aug 30 15:49:09 2009
@@ -18,6 +18,7 @@
package org.apache.ivyde.eclipse.ui.editors.xml;
import org.apache.ivyde.eclipse.IvyPlugin;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentEvent;
@@ -29,7 +30,6 @@
import org.eclipse.jface.text.TextPresentation;
import org.eclipse.jface.text.presentation.IPresentationDamager;
import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.jface.util.Assert;
import org.eclipse.swt.custom.StyleRange;
public class NonRuleBasedDamagerRepairer implements IPresentationDamager,
IPresentationRepairer {
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLEditor.java
Sun Aug 30 15:49:09 2009
@@ -20,7 +20,7 @@
import org.apache.ivyde.eclipse.IvyPlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.swt.SWT;
import org.eclipse.ui.editors.text.TextEditor;
import org.eclipse.ui.texteditor.TextOperationAction;
@@ -53,7 +53,7 @@
// This action will fire a CONTENTASSIST_PROPOSALS operation
// when executed
IAction action = new
TextOperationAction(IvyPlugin.getDefault().getResourceBundle(),
- "ContentAssistProposal", this,
SourceViewer.CONTENTASSIST_PROPOSALS);
+ "ContentAssistProposal", this,
ISourceViewer.CONTENTASSIST_PROPOSALS);
action.setActionDefinitionId(CONTENTASSIST_PROPOSAL_ID);
// Tell the editor about this new action
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLTagScanner.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLTagScanner.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLTagScanner.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLTagScanner.java
Sun Aug 30 15:49:09 2009
@@ -30,7 +30,9 @@
public XMLTagScanner(ColorManager manager) {
IToken string = new Token(new
TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
+ // CheckStyle:MagicNumber| OFF
IRule[] rules = new IRule[3];
+ // CheckStyle:MagicNumber| ON
// Add rule for double quotes
rules[0] = new SingleLineRule("\"", "\"", string, '\\');
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyDEPreferenceStoreHelper.java
Sun Aug 30 15:49:09 2009
@@ -20,7 +20,6 @@
import java.util.Collection;
import java.util.List;
-import org.apache.ivyde.eclipse.IvyPlugin;
import org.apache.ivyde.eclipse.cpcontainer.IvyClasspathUtil;
import org.eclipse.jface.preference.IPreferenceStore;
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/views/ReportView.java
Sun Aug 30 15:49:09 2009
@@ -48,6 +48,7 @@
}
public void setFocus() {
+ // nothing to do
}
public void selectionChanged(IWorkbenchPart part, ISelection sel) {
Modified:
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/IvyDEStrategy.java
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/IvyDEStrategy.java?rev=809362&r1=809361&r2=809362&view=diff
==============================================================================
---
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/IvyDEStrategy.java
(original)
+++
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/IvyDEStrategy.java
Sun Aug 30 15:49:09 2009
@@ -23,12 +23,11 @@
import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.plugins.latest.ArtifactInfo;
import org.apache.ivy.plugins.latest.ComparatorLatestStrategy;
-import org.apache.ivy.plugins.latest.LatestRevisionStrategy;
import org.apache.ivy.plugins.version.VersionMatcher;
/**
- * A dumb copy of the {...@link LatestRevisionStrategy} but that take into
account the latest and
- * working revision as superior to any other revision.
+ * A dumb copy of the {...@link
org.apache.ivy.plugins.latest.LatestRevisionStrategy} but that take
+ * into account the latest and working revision as superior to any other
revision.
*/
public class IvyDEStrategy extends ComparatorLatestStrategy {
