You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2008/09/06 17:06:54 UTC
svn commit: r692658 [1/3] - in
/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde:
common/completion/ common/ivyfile/ common/ivysettings/ common/model/
eclipse/ eclipse/cpcontainer/ eclipse/cpcontainer/fragmentinfo/
eclipse/ui/acti...
Author: hibou
Date: Sat Sep 6 08:06:53 2008
New Revision: 692658
URL: http://svn.apache.org/viewvc?rev=692658&view=rev
Log:
Reduce drastically the number of error raised by checkstyle
Modified:
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/IvyFileUpdater.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/common/ivysettings/IvySettingsFile.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyModel.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTagAttribute.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/ListValueProvider.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/Proposal.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.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/IvyClasspathContainerConfiguration.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathContainerDecorator.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvyClasspathInitializer.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/IvydeContainerPage.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/fragmentinfo/PreferenceStoreInfo.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/CleanCacheAction.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/CleanCacheMenuAction.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEContainerAction.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/IvyDEContainerMenuAction.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/actions/ResolveAllAction.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/IvyConsoleFactory.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/core/IvyFileEditorInput.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/IvyModuleDescriptorEditorContributor.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/pages/IvyConfSection.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/pages/IvyInfoSection.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/pages/OverviewFormPage.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/ColorManager.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/EclipseIvyModelSettings.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IXMLColorConstants.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/IvyContentAssistProcessor.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/XMLConfiguration.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/editors/xml/XMLDoubleClickStrategy.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/XMLPartitionScanner.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/IvyPreferencePage.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/preferences/PreferenceConstants.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/ui/wizards/IvyNewWizard.java
ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/wizards/IvyNewWizardPage.java
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=692658&r1=692657&r2=692658&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 Sat Sep 6 08:06:53 2008
@@ -196,7 +196,7 @@
for (int i = 0; i < props.length; i++) {
// Construct proposal and add to result list
propList.add(new CodeCompletionProposal(
- props[i].getProposal(), ivyfile.getOffset()- qlen, qlen + caretOffset,
+ props[i].getProposal(), ivyfile.getOffset() - qlen, qlen + caretOffset,
props[i].getCursor(), null, props[i].getDoc()));
}
}
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivyfile/IvyFileUpdater.java Sat Sep 6 08:06:53 2008
@@ -34,22 +34,28 @@
private static class UpdateInfo {
int insertFromIndex = 0;
+
int insertToIndex = 0;
+
String prefix = "";
+
String suffix = "";
+
String insert = "";
}
-
- public void addDependency(File ivyFile, String org, String name, String revision, String confMapping) throws IOException {
- ModuleRevisionId depId = new ModuleRevisionId(new ModuleId(org,name), revision);
+
+ public void addDependency(File ivyFile, String org, String name, String revision,
+ String confMapping) throws IOException {
+ ModuleRevisionId depId = new ModuleRevisionId(new ModuleId(org, name), revision);
addDependency(ivyFile, depId, confMapping);
}
-
- public void addDependency(File ivyFile, ModuleRevisionId depId, String confMapping) throws IOException {
+
+ public void addDependency(File ivyFile, ModuleRevisionId depId, String confMapping)
+ throws IOException {
String content = FileUtil.readEntirely(ivyFile);
-
+
UpdateInfo info = findUpdateInfoToAddDependency(content, depId, confMapping);
-
+
update(ivyFile, content, info);
}
@@ -62,18 +68,17 @@
* the file pointing to the Ivy file to update
* @param depId
* the module id of the dependency to remove or exclude
- */
+ */
public void removeOrExcludeDependency(File ivyFile, ModuleId depId) throws IOException {
String content = FileUtil.readEntirely(ivyFile);
-
+
UpdateInfo info = findUpdateInfoToRemoveDependency(content, depId);
if (info != null) {
update(ivyFile, content, info);
}
}
- private void update(File ivyFile, String content, UpdateInfo info)
- throws FileNotFoundException {
+ private void update(File ivyFile, String content, UpdateInfo info) throws FileNotFoundException {
PrintWriter w = new PrintWriter(new FileOutputStream(ivyFile));
try {
w.print(content.substring(0, info.insertFromIndex));
@@ -87,17 +92,18 @@
}
}
- private UpdateInfo findUpdateInfoToAddDependency(String content, ModuleRevisionId depId, String confMapping) {
+ private UpdateInfo findUpdateInfoToAddDependency(String content, ModuleRevisionId depId,
+ String confMapping) {
UpdateInfo info = new UpdateInfo();
info.insert = getDependencyToAdd(depId, confMapping);
-
+
Pattern dependenciesClose = Pattern.compile("<\\s*/dependencies");
Matcher depsCloseMatcher = dependenciesClose.matcher(content);
if (depsCloseMatcher.find()) {
info.insertFromIndex = findLastDependencyEnd(content, depsCloseMatcher.start());
if (info.insertFromIndex == -1) {
- info.insertFromIndex = getLastMatchIndex(Pattern.compile("<\\s*dependencies.*?>"),
- content, depsCloseMatcher.start());
+ info.insertFromIndex = getLastMatchIndex(Pattern.compile("<\\s*dependencies.*?>"),
+ content, depsCloseMatcher.start());
if (info.insertFromIndex == -1) {
info.insertFromIndex = depsCloseMatcher.start();
} else {
@@ -129,16 +135,17 @@
}
return info;
}
-
+
private UpdateInfo findUpdateInfoToRemoveDependency(String content, ModuleId depId) {
UpdateInfo info = new UpdateInfo();
-
+
Matcher depsMatcher = Pattern.compile("<\\s*dependencies").matcher(content);
if (!depsMatcher.find()) {
// no dependencies at all, nothing to do
return null;
}
- Matcher depMatcher = Pattern.compile("<\\s*dependency\\s+.*name=[\"']([^\"']+)[\"']").matcher(content);
+ Matcher depMatcher = Pattern.compile("<\\s*dependency\\s+.*name=[\"']([^\"']+)[\"']")
+ .matcher(content);
int start = depsMatcher.start();
while (depMatcher.find(start)) {
if (depId.getName().equals(depMatcher.group(1))) {
@@ -150,8 +157,8 @@
}
m = Pattern.compile("<\\s*dependency[^<]*?\\/\\>").matcher(content);
if (m.find(info.insertFromIndex)) {
- info.insertToIndex = info.insertToIndex > 0
- ? Math.min(info.insertToIndex, m.end()) : m.end();
+ info.insertToIndex = info.insertToIndex > 0 ? Math.min(info.insertToIndex, m
+ .end()) : m.end();
}
info.insertFromIndex = findStartOfBlock(content, info.insertFromIndex);
info.insertToIndex = findEndOfBlock(content, info.insertToIndex);
@@ -159,9 +166,9 @@
}
start = depMatcher.end();
}
-
+
// we haven't found the dependency in the list of declared dependencies
-
+
if (start == depsMatcher.start()) {
// no dependencies at all, nothing to do
return null;
@@ -180,11 +187,13 @@
}
private int findLastDependencyEnd(String content, int end) {
- int depCloseIndex = getLastMatchIndex(Pattern.compile("</\\s*dependency\\s*>"), content, end);
- int depOpCloseIndex = getLastMatchIndex(Pattern.compile("\\<\\s*dependency.*?\\/\\>"), content, end);
+ int depCloseIndex = getLastMatchIndex(Pattern.compile("</\\s*dependency\\s*>"), content,
+ end);
+ int depOpCloseIndex = getLastMatchIndex(Pattern.compile("\\<\\s*dependency.*?\\/\\>"),
+ content, end);
return Math.max(depCloseIndex, depOpCloseIndex);
}
-
+
private String getDependencyToAdd(ModuleRevisionId depId, String confMapping) {
String dep = " <dependency org=\"" + depId.getOrganisation() + "\"";
dep += " name=\"" + depId.getName() + "\"";
@@ -225,7 +234,7 @@
}
return 0;
}
-
+
private int findEndOfBlock(String content, int index) {
for (; index < content.length(); index++) {
char c = content.charAt(index);
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=692658&r1=692657&r2=692658&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 Sat Sep 6 08:06:53 2008
@@ -44,15 +44,13 @@
public class IvyModuleDescriptorModel extends IvyModel {
public IvyModuleDescriptorModel(IvyModelSettings settings) {
super(settings);
-
+
// ivy-module
IvyTag ivyTag = new IvyTag("ivy-module", "root tag of ivy file");
ivyTag.setDoc("Root tag of any ivy-file.");
- ivyTag.addAttribute(new IvyTagAttribute(
- "version",
- "The version of the ivy file specification \n"
- + "should be '2.0' with current version of ivy",
- true));
+ ivyTag.addAttribute(new IvyTagAttribute("version",
+ "The version of the ivy file specification \n"
+ + "should be '2.0' with current version of ivy", true));
addTag(ivyTag);
IValueProvider defaultOrganizationProvider = new IValueProvider() {
@@ -74,7 +72,8 @@
"the status of this module.");
statusTagAttribute.setValueProvider(new ListValueProvider(getDefault("status")));
IvyTagAttribute pubTagAttribute = new IvyTagAttribute("publication",
- "the date of publication of this module. \nIt should be given in this format: yyyyMMddHHmmss");
+ "the date of publication of this module. \n"
+ + "It should be given in this format: yyyyMMddHHmmss");
pubTagAttribute.setValueProvider(new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
return new String[] {Ivy.DATE_FORMAT.format(new Date())};
@@ -96,11 +95,9 @@
addTag(info);
IvyTag child = new IvyTag("license",
"gives information about the licenses of the described module");
- child
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of the license. \nTry to respect spelling when using a classical license.",
- true, new ListValueProvider(getDefault("license"))));
+ child.addAttribute(new IvyTagAttribute("name", "the name of the license. \n"
+ + "Try to respect spelling when using a classical license.", true,
+ new ListValueProvider(getDefault("license"))));
child
.addAttribute(new IvyTagAttribute("url", "an url pointing to the license text.",
false));
@@ -117,15 +114,13 @@
info.addChildIvyTag(child);
child = new IvyTag("repository",
"describes on which public repositories this module can be found");
- child
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of the repository. \nTry to respect spelling for common repositories (ibiblio, ivyrep, ...)",
- true, new IValueProvider() {
- public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
- return new String[] {"ibiblio", "ivyrep"};
- }
- }));
+ child.addAttribute(new IvyTagAttribute("name", "the name of the repository. \n"
+ + "Try to respect spelling for common repositories (ibiblio, ivyrep, ...)", true,
+ new IValueProvider() {
+ public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
+ return new String[] {"ibiblio", "ivyrep"};
+ }
+ }));
child.addAttribute(new IvyTagAttribute("url", "an url pointing to the repository.", true,
new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
@@ -179,20 +174,20 @@
true));
conf.addAttribute(new IvyTagAttribute("description",
"a short description for the declared configuration", false));
- IvyTagAttribute visibilityTagAttribute = new IvyTagAttribute(
- "visibility",
- "the visibility of the declared configuration.\n'public' means that this configuration can be used by other modules, \nwhile 'private' means that this configuration is used only in the module itself, \nand is not exposed to other modules",
- false);
+ IvyTagAttribute visibilityTagAttribute = new IvyTagAttribute("visibility",
+ "the visibility of the declared configuration.\n"
+ + "'public' means that this configuration can be used by other modules, \n"
+ + "while 'private' means that this configuration is used only in the\n"
+ + "module itself, and is not exposed to other modules", false);
visibilityTagAttribute.setValueProvider(new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
return new String[] {"public", "private"};
}
});
conf.addAttribute(visibilityTagAttribute);
- IvyTagAttribute confExtTagAttribute = new IvyTagAttribute(
- "extends",
- "a comma separated list of configurations of this module \nthat the current configuration extends",
- false);
+ IvyTagAttribute confExtTagAttribute = new IvyTagAttribute("extends",
+ "a comma separated list of configurations of this module \n"
+ + "that the current configuration extends", false);
IValueProvider masterConfsValueProvider = new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
StringBuffer base = new StringBuffer();
@@ -218,10 +213,10 @@
};
confExtTagAttribute.setValueProvider(masterConfsValueProvider);
conf.addAttribute(confExtTagAttribute);
- IvyTagAttribute deprecatedTagAttribute = new IvyTagAttribute(
- "deprecated",
- "indicates that this conf has been deprecated \nby giving the date of the deprecation. \nIt should be given in this format: yyyyMMddHHmmss",
- false);
+ IvyTagAttribute deprecatedTagAttribute = new IvyTagAttribute("deprecated",
+ "indicates that this conf has been deprecated \n"
+ + "by giving the date of the deprecation. \n"
+ + "It should be given in this format: yyyyMMddHHmmss", false);
deprecatedTagAttribute.setValueProvider(new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
return new String[] {Ivy.DATE_FORMAT.format(new Date())};
@@ -242,25 +237,22 @@
artifact.addAttribute(new IvyTagAttribute("name",
"the name of the published artifact. This name must not include revision.", true,
projectNameValueProvider));
- artifact
- .addAttribute(new IvyTagAttribute(
- "type",
- "the type of the published artifact. \nIt's usually its extension, but not necessarily. \nFor instance, ivy files are of type 'ivy' but have 'xml' extension",
- true, new ListValueProvider(getDefault("type"))));
+ artifact.addAttribute(new IvyTagAttribute("type", "the type of the published artifact. \n"
+ + "It's usually its extension, but not necessarily. \n"
+ + "For instance, ivy files are of type 'ivy' but have 'xml' extension", true,
+ new ListValueProvider(getDefault("type"))));
artifact.addAttribute(new IvyTagAttribute("ext", "the extension of the published artifact",
false, new ListValueProvider(getDefault("ext"))));
- artifact
- .addAttribute(new IvyTagAttribute(
- "conf",
- "comma separated list of public configurations in which this artifact is published. \n'*' wildcard can be used to designate all public configurations of this module",
- false, masterConfsValueProvider));
+ artifact.addAttribute(new IvyTagAttribute("conf",
+ "comma separated list of public configurations in which this artifact\n"
+ + "is published. '*' wildcard can be used to designate all public\n"
+ + "configurations of this module", false, masterConfsValueProvider));
IvyTag conf2 = new IvyTag("conf",
"indicates a public configuration in which this artifact is published");
- conf2
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of a module public configuration in which this artifact is published. \n'*' wildcard can be used to designate all public configurations of this module",
- true, masterConfValueProvider));
+ conf2.addAttribute(new IvyTagAttribute("name",
+ "the name of a module public configuration in which this artifact\n"
+ + "is published. '*' wildcard can be used to designate all\n"
+ + "public configurations of this module", true, masterConfValueProvider));
allConf.add(conf2);
artifact.addChildIvyTag(conf2);
publications.addChildIvyTag(artifact);
@@ -315,10 +307,10 @@
}
});
dependency.addAttribute(branch);
- IvyTagAttribute rev = new IvyTagAttribute(
- "rev",
- "the revision of the dependency. \nUse 'latest.integration' to get the latest version of the dependency. \nYou can also end the revision asked with a '+' to get the latest matching revision.",
- true);
+ IvyTagAttribute rev = new IvyTagAttribute("rev", "the revision of the dependency. \n"
+ + "Use 'latest.integration' to get the latest version of the dependency. \n"
+ + "You can also end the revision asked with a '+' to get the latest"
+ + " matching revision.", true);
rev.setValueProvider(new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
List ret = listDependencyTokenValues(att.getName(), ivyFile);
@@ -327,11 +319,9 @@
}
});
dependency.addAttribute(rev);
- dependency
- .addAttribute(new IvyBooleanTagAttribute(
- "force",
- "a boolean to give an indication to conflict manager \nthat this dependency should be forced to this revision",
- false));
+ dependency.addAttribute(new IvyBooleanTagAttribute("force",
+ "a boolean to give an indication to conflict manager \n"
+ + "that this dependency should be forced to this revision", false));
dependency.addAttribute(new IvyBooleanTagAttribute("transitive",
"a boolean indicating if this dependency should be resolved transitively or not",
false));
@@ -426,8 +416,8 @@
ret.add("*");
return (String[]) ret.toArray(new String[ret.size()]);
} catch (ParseException e) {
- getSettings().logError("The dependencies of " + mrid
- + " could not be parsed", e);
+ getSettings().logError("The dependencies of " + mrid + " could not be parsed",
+ e);
return null;
}
}
@@ -437,68 +427,69 @@
conf3
.addAttribute(new IvyTagAttribute(
"name",
- "the name of the master configuration to map. \n'*' wildcard can be used to designate all configurations of this module",
+ "the name of the master configuration to map. \n"
+ + "'*' wildcard can be used to designate all configurations of this module",
true, masterConfValueProvider));
- conf3
- .addAttribute(new IvyTagAttribute(
- "mapped",
- "a comma separated list of dependency configurations \nto which this master configuration should be mapped",
- false, new IValueProvider() {
- public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
- Ivy ivy = getIvy();
- int[] indexes = ivyFile.getParentTagIndex();
- if (indexes != null && ivy != null) {
- Map otherAttValues = ivyFile.getAllAttsValues(indexes[0] + 1);
- String org = ((IvyModuleDescriptorFile) ivyFile)
- .getDependencyOrganisation(otherAttValues);
- if (org != null && otherAttValues != null
- && otherAttValues.get("name") != null
- && otherAttValues.get("rev") != null) {
- StringBuffer base = new StringBuffer();
- String qualifier = ivyFile.getAttributeValueQualifier();
- // search for word after last comma
- int comma = qualifier.lastIndexOf(",") + 1;
- base.append(qualifier.substring(0, comma));
- qualifier = qualifier.substring(comma);
- while (qualifier.length() > 0 && qualifier.charAt(0) == ' ') {
- base.append(' ');
- qualifier = qualifier.substring(1);
- }
- ResolveData data = new ResolveData(ivy.getResolveEngine(),
- new ResolveOptions());
- ModuleRevisionId mrid = ModuleRevisionId.newInstance(org,
- (String) otherAttValues.get("name"),
- (String) otherAttValues.get("rev"));
- DefaultDependencyDescriptor ddd = new DefaultDependencyDescriptor(
- mrid, false);
- try {
- String[] confs = ivy.getSettings().getResolver(mrid)
- .getDependency(ddd, data).getDescriptor()
- .getConfigurationsNames();
- for (int i = 0; i < confs.length; i++) {
- confs[i] = base + confs[i];
- }
- List ret = new ArrayList(Arrays.asList(confs));
- ret.add("*");
- return (String[]) ret.toArray(new String[ret.size()]);
- } catch (ParseException e) {
- getSettings().logError("The dependencies of "
- + mrid + " could not be parsed", e);
- return new String[] {"*"};
- }
+ conf3.addAttribute(new IvyTagAttribute("mapped",
+ "a comma separated list of dependency configurations \n"
+ + "to which this master configuration should be mapped", false,
+ new IValueProvider() {
+ public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
+ Ivy ivy = getIvy();
+ int[] indexes = ivyFile.getParentTagIndex();
+ if (indexes != null && ivy != null) {
+ Map otherAttValues = ivyFile.getAllAttsValues(indexes[0] + 1);
+ String org = ((IvyModuleDescriptorFile) ivyFile)
+ .getDependencyOrganisation(otherAttValues);
+ if (org != null && otherAttValues != null
+ && otherAttValues.get("name") != null
+ && otherAttValues.get("rev") != null) {
+ StringBuffer base = new StringBuffer();
+ String qualifier = ivyFile.getAttributeValueQualifier();
+ // search for word after last comma
+ int comma = qualifier.lastIndexOf(",") + 1;
+ base.append(qualifier.substring(0, comma));
+ qualifier = qualifier.substring(comma);
+ while (qualifier.length() > 0 && qualifier.charAt(0) == ' ') {
+ base.append(' ');
+ qualifier = qualifier.substring(1);
+ }
+ ResolveData data = new ResolveData(ivy.getResolveEngine(),
+ new ResolveOptions());
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance(org,
+ (String) otherAttValues.get("name"), (String) otherAttValues
+ .get("rev"));
+ DefaultDependencyDescriptor ddd = new DefaultDependencyDescriptor(
+ mrid, false);
+ try {
+ String[] confs = ivy.getSettings().getResolver(mrid)
+ .getDependency(ddd, data).getDescriptor()
+ .getConfigurationsNames();
+ for (int i = 0; i < confs.length; i++) {
+ confs[i] = base + confs[i];
}
+ List ret = new ArrayList(Arrays.asList(confs));
+ ret.add("*");
+ return (String[]) ret.toArray(new String[ret.size()]);
+ } catch (ParseException e) {
+ getSettings().logError(
+ "The dependencies of " + mrid + " could not be parsed", e);
+ return new String[] {"*"};
}
- return new String[] {"*"};
}
+ }
+ return new String[] {"*"};
+ }
- }));
+ }));
allConf.add(conf3);
IvyTag mapped = new IvyTag("mapped",
"map dependency configurations for this master configuration");
mapped
.addAttribute(new IvyTagAttribute(
"name",
- "the name of the dependency configuration mapped. \n'*' wildcard can be used to designate all configurations of this module",
+ "the name of the dependency configuration mapped. \n"
+ + "'*' wildcard can be used to designate all configurations of this module",
true, new IValueProvider() {
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
Ivy ivy = getIvy();
@@ -530,8 +521,8 @@
.toArray(new String[ret.size()]);
} catch (ParseException e) {
getSettings().logError(
- "The dependencies of "
- + mrid + " could not be parsed", e);
+ "The dependencies of " + mrid
+ + " could not be parsed", e);
return new String[] {"*"};
}
}
@@ -551,115 +542,103 @@
}
ListValueProvider matcherNamesProvider = new ListValueProvider(matcherNames);
- IvyTag artifact2 = new IvyTag("artifact",
- "defines artifacts restriction \nuse only if you do not control dependency ivy file");
+ IvyTag artifact2 = new IvyTag("artifact", "defines artifacts restriction \n"
+ + "use only if you do not control dependency ivy file");
+ artifact2.addAttribute(new IvyTagAttribute("name", "the name of an artifact of the \n"
+ + "dependency module to add to the include list, \n"
+ + "or a regexp matching this name", false));
+ artifact2.addAttribute(new IvyTagAttribute("type", "the type of the artifact of the \n"
+ + "dependency module to add to the include list, \n"
+ + "or a regexp matching this name", false,
+ new ListValueProvider(getDefault("type"))));
artifact2
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of an artifact of the \ndependency module to add to the include list, \nor a regexp matching this name",
- false));
- artifact2
- .addAttribute(new IvyTagAttribute(
- "type",
- "the type of the artifact of the \ndependency module to add to the include list, \nor a regexp matching this name",
- false, new ListValueProvider(getDefault("type"))));
- artifact2
- .addAttribute(new IvyTagAttribute(
- "ext",
- "the extension of the artifact of the \ndependency module to add to the include list, \nor a regexp matching this name",
- false, new ListValueProvider(getDefault("ext"))));
- artifact2
- .addAttribute(new IvyTagAttribute(
- "url",
- "an url where this artifact can be found \nif it isn't present at the standard \nlocation in the repository",
- false));
+ .addAttribute(new IvyTagAttribute("ext", "the extension of the artifact of the \n"
+ + "dependency module to add to the include list, \n"
+ + "or a regexp matching this name", false, new ListValueProvider(
+ getDefault("ext"))));
+ artifact2.addAttribute(new IvyTagAttribute("url",
+ "an url where this artifact can be found \n"
+ + "if it isn't present at the standard \n" + "location in the repository",
+ false));
artifact2
.addAttribute(new IvyTagAttribute(
"conf",
- "comma separated list of the master configurations \nin which this artifact should be included. \n'*' wildcard can be used to designate all configurations of this module",
+ "comma separated list of the master configurations \n"
+ + "in which this artifact should be included. \n"
+ + "'*' wildcard can be used to designate all configurations of this module",
false, masterConfsValueProvider));
IvyTag conf4 = new IvyTag("conf", "configuration in which the artifact should be included");
- conf4
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of the master configuration in which \nthe enclosing artifact should be included",
- true, masterConfValueProvider));
+ conf4.addAttribute(new IvyTagAttribute("name",
+ "the name of the master configuration in which \n"
+ + "the enclosing artifact should be included", true,
+ masterConfValueProvider));
allConf.add(conf4);
artifact2.addChildIvyTag(conf4);
addTag(artifact2);
- IvyTag include = new IvyTag("include",
- "defines artifacts restriction \nuse only if you do not control dependency ivy file");
+ IvyTag include = new IvyTag("include", "defines artifacts restriction \n"
+ + "use only if you do not control dependency ivy file");
+ include.addAttribute(new IvyTagAttribute("name", "the name of an artifact of the \n"
+ + "dependency module to add to the include list, \n"
+ + "or a regexp matching this name", false));
+ include.addAttribute(new IvyTagAttribute("type", "the type of the artifact of the \n"
+ + "dependency module to add to the include list, \n"
+ + "or a regexp matching this name", false,
+ new ListValueProvider(getDefault("type"))));
include
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of an artifact of the \ndependency module to add to the include list, \nor a regexp matching this name",
- false));
- include
- .addAttribute(new IvyTagAttribute(
- "type",
- "the type of the artifact of the \ndependency module to add to the include list, \nor a regexp matching this name",
- false, new ListValueProvider(getDefault("type"))));
- include
- .addAttribute(new IvyTagAttribute(
- "ext",
- "the extension of the artifact of the \ndependency module to add to the include list, \nor a regexp matching this name",
- false, new ListValueProvider(getDefault("ext"))));
+ .addAttribute(new IvyTagAttribute("ext", "the extension of the artifact of the \n"
+ + "dependency module to add to the include list, \n"
+ + "or a regexp matching this name", false, new ListValueProvider(
+ getDefault("ext"))));
include.addAttribute(new IvyTagAttribute("matcher",
"the matcher to use to match the modules to include", false, matcherNamesProvider));
include
.addAttribute(new IvyTagAttribute(
"conf",
- "comma separated list of the master configurations \nin which this artifact should be included. \n'*' wildcard can be used to designate all configurations of this module",
+ "comma separated list of the master configurations \n"
+ + "in which this artifact should be included. \n"
+ + "'*' wildcard can be used to designate all configurations of this module",
false, masterConfsValueProvider));
IvyTag conf5 = new IvyTag("conf", "configuration in which the artifact should be included");
- conf5
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of the master configuration in which \nthe enclosing artifact should be included",
- true, masterConfValueProvider));
+ conf5.addAttribute(new IvyTagAttribute("name",
+ "the name of the master configuration in which \n"
+ + "the enclosing artifact should be included", true,
+ masterConfValueProvider));
include.addChildIvyTag(conf5);
addTag(include);
allConf.add(conf5);
- IvyTag exclude = new IvyTag("exclude",
- "defines artifacts restriction \nuse only if you do not control dependency ivy file");
- exclude
- .addAttribute(new IvyTagAttribute(
- "org",
- "the organisation of the dependency \nmodule or artifact to exclude, \nor a pattern matching this organisation",
- false));
- exclude
- .addAttribute(new IvyTagAttribute(
- "module",
- "the name of the dependency \nmodule or the artifact to exclude, \nor a pattern matching this module name",
- false));
- exclude
- .addAttribute(new IvyTagAttribute(
- "name",
- "the name of an artifact of the \ndependency module to add to the exclude list, \nor a pattern matching this name",
- false));
- exclude
- .addAttribute(new IvyTagAttribute(
- "type",
- "the type of the artifact of the \ndependency module to add to the exclude list, \nor a pattern matching this name",
- false, new ListValueProvider(getDefault("type"))));
- exclude
- .addAttribute(new IvyTagAttribute(
- "ext",
- "the extension of the artifact of the \ndependency module to add to the exclude list, \nor a pattern matching this name",
- false, new ListValueProvider(getDefault("ext"))));
+ IvyTag exclude = new IvyTag("exclude", "defines artifacts restriction \n"
+ + "use only if you do not control dependency ivy file");
+ exclude.addAttribute(new IvyTagAttribute("org", "the organisation of the dependency \n"
+ + "module or artifact to exclude, \n" + "or a pattern matching this organisation",
+ false));
+ exclude.addAttribute(new IvyTagAttribute("module", "the name of the dependency \n"
+ + "module or the artifact to exclude, \n"
+ + "or a pattern matching this module name", false));
+ exclude.addAttribute(new IvyTagAttribute("name", "the name of an artifact of the \n"
+ + "dependency module to add to the exclude list, \n"
+ + "or a pattern matching this name", false));
+ exclude.addAttribute(new IvyTagAttribute("type", "the type of the artifact of the \n"
+ + "dependency module to add to the exclude list, \n"
+ + "or a pattern matching this name", false, new ListValueProvider(
+ getDefault("type"))));
+ exclude.addAttribute(new IvyTagAttribute("ext", "the extension of the artifact of the \n"
+ + "dependency module to add to the exclude list, \n"
+ + "or a pattern matching this name", false,
+ 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 \nin which this artifact should be excluded. \n'*' wildcard can be used to designate all configurations of this module",
+ "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 \nthe enclosing artifact should be excluded",
- true, masterConfValueProvider));
+ conf6.addAttribute(new IvyTagAttribute("name",
+ "the name of the master configuration in which \n"
+ + "the enclosing artifact should be excluded", true,
+ masterConfValueProvider));
allConf.add(conf6);
exclude.addChildIvyTag(conf6);
addTag(exclude);
@@ -676,16 +655,12 @@
IvyTag conflicts = new IvyTag("conflicts", "conflicts managers definition section");
IvyTag manager = new IvyTag("manager", "declares a conflict manager for this module");
- manager
- .addAttribute(new IvyTagAttribute(
- "org",
- "the name, or a regexp matching the name of organisation \nto which this conflict manager should apply",
- false));
- manager
- .addAttribute(new IvyTagAttribute(
- "module",
- "the name, or a regexp matching the name of module \nto which this conflict manager should apply",
- false));
+ manager.addAttribute(new IvyTagAttribute("org",
+ "the name, or a regexp matching the name of organisation \n"
+ + "to which this conflict manager should apply", false));
+ manager.addAttribute(new IvyTagAttribute("module",
+ "the name, or a regexp matching the name of module \n"
+ + "to which this conflict manager should apply", false));
manager.addAttribute(new IvyTagAttribute("name", "the name of the conflict manager to use",
false));
manager.addAttribute(new IvyTagAttribute("rev",
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsFile.java Sat Sep 6 08:06:53 2008
@@ -36,14 +36,16 @@
import org.apache.ivyde.common.model.IvyModelSettings;
public class IvySettingsFile extends IvyFile {
- private static final Pattern CLASSPATH_URL_PATTERN = Pattern.compile("<[\\s]*classpath[^>]+url=\"([^\"]+)");
- private static final Pattern CLASSPATH_FILE_PATTERN = Pattern.compile("<[\\s]*classpath[^>]+file=\"([^\"]+)");
+ private static final Pattern CLASSPATH_URL_PATTERN = Pattern
+ .compile("<[\\s]*classpath[^>]+url=\"([^\"]+)");
- private static final Pattern TYPEDEF_PATTERN = Pattern.compile(
- "<[\\s]*typedef[^>]+name=\"([^\"]+)\"[^>]+classname=\"([^\"]+)");
-
- private File file;
+ private static final Pattern CLASSPATH_FILE_PATTERN = Pattern
+ .compile("<[\\s]*classpath[^>]+file=\"([^\"]+)");
+
+ private static final Pattern TYPEDEF_PATTERN = Pattern
+ .compile("<[\\s]*typedef[^>]+name=\"([^\"]+)\"[^>]+classname=\"([^\"]+)");
+ private File file;
public IvySettingsFile(IvyModelSettings settings, File file, String projectName, String doc,
int currentOffset) {
@@ -85,7 +87,7 @@
return IvyPatternHelper.substituteVariables(str, variables);
}
- public Map/*<String,String>*/ getTypedefs() {
+ public Map/* <String,String> */getTypedefs() {
Map p = getDefaultTypedefs();
Matcher m = TYPEDEF_PATTERN.matcher(getDoc());
while (m.find()) {
@@ -94,7 +96,7 @@
return p;
}
- public static Map/*<String,String>*/ getDefaultTypedefs() {
+ public static Map/* <String,String> */getDefaultTypedefs() {
Properties p = new Properties();
try {
p.load(XmlSettingsParser.class.getResourceAsStream("typedef.properties"));
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/ivysettings/IvySettingsModel.java Sat Sep 6 08:06:53 2008
@@ -260,7 +260,8 @@
Method[] methods = clazz.getMethods();
for (int i = 0; i < methods.length; i++) {
Method m = methods[i];
- if (m.getName().startsWith("create") && m.getParameterTypes().length == 0
+ if (m.getName().startsWith("create")
+ && m.getParameterTypes().length == 0
&& isSupportedChildType(m.getReturnType())) {
String name = StringUtils
.uncapitalize(m.getName().substring("create".length()));
@@ -273,10 +274,11 @@
&& isSupportedChildType(m.getParameterTypes()[0])
&& Void.TYPE.equals(m.getReturnType())) {
String name = StringUtils.uncapitalize(m.getName().substring(
- m.getName().startsWith("addConfigured") ?
- "addConfigured".length() : "add".length()));
+ m.getName().startsWith("addConfigured") ? "addConfigured"
+ .length() : "add".length()));
if (name.length() == 0) {
- addTypedefChildren(this, getChildClasses(typedefClasses, m.getParameterTypes()[0]));
+ addTypedefChildren(this, getChildClasses(typedefClasses, m
+ .getParameterTypes()[0]));
} else {
addChildIvyTag(typedefedTag(name, m.getParameterTypes()[0]));
}
@@ -284,8 +286,8 @@
&& Void.TYPE.equals(m.getReturnType())
&& m.getParameterTypes().length == 1
&& isSupportedAttributeType(m.getParameterTypes()[0])) {
- IvyTagAttribute att = new IvyTagAttribute(
- StringUtils.uncapitalize(m.getName().substring(3)));
+ IvyTagAttribute att = new IvyTagAttribute(StringUtils
+ .uncapitalize(m.getName().substring("set".length())));
if (m.getParameterTypes()[0] == boolean.class) {
att.setValueProvider(IvyBooleanTagAttribute.VALUE_PROVIDER);
}
@@ -318,8 +320,7 @@
&& !Integer.class.equals(type) && !int.class.equals(type)
&& !Short.class.equals(type) && !short.class.equals(type)
&& !Long.class.equals(type) && !long.class.equals(type)
- && !Class.class.equals(type)
- ;
+ && !Class.class.equals(type);
}
private boolean isSupportedAttributeType(Class type) {
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyFile.java Sat Sep 6 08:06:53 2008
@@ -32,13 +32,13 @@
private static final Pattern ATTRIBUTE_VALUE_PATTERN = Pattern
.compile("([a-zA-Z0-9]+)[ ]*=[ ]*\"([^\"]*)\"");
- private String _doc;
+ private String doc;
- private int _currentOffset;
+ private int currentOffset;
- private String _reversed;
+ private String reversed;
- private String _projectName;
+ private String projectName;
private IvyModelSettings settings;
@@ -48,26 +48,26 @@
public IvyFile(IvyModelSettings settings, String projectName, String doc, int currentOffset) {
this.settings = settings;
- _projectName = projectName;
- _doc = doc;
- _reversed = new StringBuffer(doc).reverse().toString();
- _currentOffset = currentOffset;
+ this.projectName = projectName;
+ this.doc = doc;
+ this.reversed = new StringBuffer(doc).reverse().toString();
+ this.currentOffset = currentOffset;
}
protected String getDoc() {
- return _doc;
+ return doc;
}
protected int getCurrentOffset() {
- return _currentOffset;
+ return currentOffset;
}
protected String getReversedDoc() {
- return _reversed;
+ return reversed;
}
public boolean inTag() {
- return inTag(_currentOffset);
+ return inTag(currentOffset);
}
public boolean inTag(int documentOffset) {
@@ -78,20 +78,23 @@
if (documentOffset == 0) {
return false;
}
- char c = _doc.charAt(--documentOffset);
- if (Character.isWhitespace(c))
+ char c = doc.charAt(--documentOffset);
+ if (Character.isWhitespace(c)) {
hasSpace = true;
- if (c == '>' && (documentOffset == 0 || _doc.charAt(documentOffset - 1) != '-'))
+ }
+ if (c == '>' && (documentOffset == 0 || doc.charAt(documentOffset - 1) != '-')) {
return false;
+ }
if (c == '<'
- && (documentOffset + 1 >= _doc.length() || (_doc.charAt(documentOffset + 1) != '!' && _doc
- .charAt(documentOffset + 1) != '?')))
+ && (documentOffset + 1 >= doc.length() || (doc.charAt(documentOffset + 1) != '!' && doc
+ .charAt(documentOffset + 1) != '?'))) {
return hasSpace;
+ }
}
}
public String getTagName() {
- return getTagName(_currentOffset);
+ return getTagName(currentOffset);
}
/**
@@ -106,18 +109,19 @@
int lastSpaceIndex = offset;
while (true) {
// Read character backwards
- char c = _doc.charAt(--offset);
+ char c = doc.charAt(--offset);
if (Character.isWhitespace(c)) {
lastSpaceIndex = offset;
continue;
}
- if (c == '<')
- return _doc.substring(offset + 1, lastSpaceIndex).trim();
+ if (c == '<') {
+ return doc.substring(offset + 1, lastSpaceIndex).trim();
+ }
}
}
public boolean readyForValue() {
- return readyForValue(_currentOffset);
+ return readyForValue(currentOffset);
}
public boolean readyForValue(int documentOffset) {
@@ -125,51 +129,51 @@
}
public int getStringIndexBackward(String string) {
- return getStringIndexBackward(string, _currentOffset);
+ return getStringIndexBackward(string, currentOffset);
}
public int getStringIndexBackward(String string, int documentOffset) {
- String text = _doc.substring(0, documentOffset);
+ String text = doc.substring(0, documentOffset);
return text.lastIndexOf(string);
}
public int getStringIndexForward(String string) {
- return getStringIndexForward(string, _currentOffset);
+ return getStringIndexForward(string, currentOffset);
}
public int getStringIndexForward(String string, int documentOffset) {
- return _doc.indexOf(string, documentOffset);
+ return doc.indexOf(string, documentOffset);
}
public Map getAllAttsValues() {
- return getAllAttsValues(_currentOffset);
+ return getAllAttsValues(currentOffset);
}
public Map getAllAttsValues(int documentOffset) {
Map result = new HashMap();
int offset = documentOffset;
- int start = _reversed.indexOf('<', getReverseOffset(documentOffset));
+ int start = reversed.indexOf('<', getReverseOffset(documentOffset));
if (start != -1) {
start = getReverseOffset(start);
} else {
start = 0;
}
int end;
- if (_doc.charAt(documentOffset) == '>' && getAttributeName(documentOffset) == null) {
+ if (doc.charAt(documentOffset) == '>' && getAttributeName(documentOffset) == null) {
end = documentOffset + 1;
} else {
Pattern p = Pattern.compile("[^\\-]>");
- Matcher m = p.matcher(_doc);
+ Matcher m = p.matcher(doc);
if (m.find(documentOffset)) {
end = m.end();
} else {
- end = _doc.length();
+ end = doc.length();
}
}
Pattern regexp = ATTRIBUTE_VALUE_PATTERN;
try {
- String tag = _doc.substring(start, end);
+ String tag = doc.substring(start, end);
tag = tag.substring(tag.indexOf(' '));
Matcher m = regexp.matcher(tag);
while (m.find()) {
@@ -191,7 +195,7 @@
}
public String getQualifier() {
- return getQualifier(_currentOffset);
+ return getQualifier(currentOffset);
}
/**
@@ -203,16 +207,16 @@
*/
public String getQualifier(int documentOffset) {
Pattern p = QUALIFIER_PATTERN;
- Matcher m = p.matcher(_reversed);
+ Matcher m = p.matcher(reversed);
if (m.find(getReverseOffset(documentOffset))) {
- return _doc.substring(getReverseOffset(m.end()), documentOffset);
+ return doc.substring(getReverseOffset(m.end()), documentOffset);
} else {
return "";
}
}
public String getAttributeValueQualifier() {
- return getAttributeValueQualifier(_currentOffset);
+ return getAttributeValueQualifier(currentOffset);
}
/**
@@ -223,11 +227,11 @@
* @return
*/
public String getAttributeValueQualifier(int documentOffset) {
- int index = _reversed.indexOf("\"", getReverseOffset(documentOffset));
+ int index = reversed.indexOf("\"", getReverseOffset(documentOffset));
if (index == -1) {
return "";
} else {
- return _doc.substring(getReverseOffset(index), documentOffset);
+ return doc.substring(getReverseOffset(index), documentOffset);
}
}
@@ -237,12 +241,12 @@
* @return null if current offset is not in an attibute value
*/
public String getAttributeName() {
- return getAttributeName(_currentOffset);
+ return getAttributeName(currentOffset);
}
public String getAttributeName(int documentOffset) {
Pattern p = ATTRIBUTE_NAME_PATTERN;
- Matcher m = p.matcher(_reversed.substring(getReverseOffset(documentOffset)));
+ Matcher m = p.matcher(reversed.substring(getReverseOffset(documentOffset)));
if (m.find() && m.start() == 0) {
String attName = new StringBuffer(m.group(1)).reverse().toString();
return attName;
@@ -252,7 +256,7 @@
}
public String getParentTagName() {
- return getParentTagName(_currentOffset);
+ return getParentTagName(currentOffset);
}
public String getParentTagName(int documentOffset) {
@@ -263,14 +267,14 @@
public String getString(int[] indexes) {
if (indexes != null) {
- return _doc.substring(indexes[0], indexes[1]);
+ return doc.substring(indexes[0], indexes[1]);
} else {
return null;
}
}
public String getString(int start, int end) {
- return _doc.substring(start, end);
+ return doc.substring(start, end);
}
public int[] getParentTagIndex(int documentOffset) {
@@ -282,9 +286,9 @@
Stack stack = new Stack();
while (true) {
try {
- char c = _doc.charAt(--offset);
- if (c == '>' && _doc.charAt(offset - 1) != '-') {
- if (_doc.charAt(offset - 1) != '/') { // not a simple tag
+ char c = doc.charAt(--offset);
+ if (c == '>' && doc.charAt(offset - 1) != '-') {
+ if (doc.charAt(offset - 1) != '/') { // not a simple tag
// System.out.println("parentEndTagReached:"+doc.get(documentOffset-15,
// 15));
parentEndTagReached = true;
@@ -297,25 +301,21 @@
inSimpleTag = true;
}
} else if (c == '<') {
- if (inSimpleTag) {// simple tag end
+ if (inSimpleTag) { // simple tag end
inSimpleTag = false;
- } else if (_doc.charAt(offset + 1) == '/') { // closing tag
+ } else if (doc.charAt(offset + 1) == '/') { // closing tag
if (parentEndTagReached) {
parentEndTagReached = false;
- stack.push(_doc.substring(offset + 2, parentEndTagIndex).trim());
+ stack.push(doc.substring(offset + 2, parentEndTagIndex).trim());
lastSpaceIndex = offset + 2;
continue;
}
- } else {// opening tag
- if (_doc.charAt(offset + 1) != '!' && _doc.charAt(offset + 1) != '?') {// not
- // a
- // doc
- // tag
- // or
- // xml
+ } else { // opening tag
+ if (doc.charAt(offset + 1) != '!' && doc.charAt(offset + 1) != '?') {
+ // not a doc tag or xml
if (!stack.isEmpty()) { // we found the closing tag before
String closedName = (String) stack.peek();
- if (closedName.equalsIgnoreCase(_doc.substring(offset + 1, offset
+ if (closedName.equalsIgnoreCase(doc.substring(offset + 1, offset
+ 1 + closedName.length()))) {
stack.pop();
continue;
@@ -342,18 +342,18 @@
}
private int getReverseOffset(int documentOffset) {
- return _doc.length() - documentOffset;
+ return doc.length() - documentOffset;
}
public int getOffset() {
- return _currentOffset;
+ return currentOffset;
}
public int[] getParentTagIndex() {
- return getParentTagIndex(_currentOffset);
+ return getParentTagIndex(currentOffset);
}
public String getProjectName() {
- return _projectName;
+ return projectName;
}
}
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyModel.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyModel.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyModel.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyModel.java Sat Sep 6 08:06:53 2008
@@ -27,9 +27,10 @@
import org.apache.ivy.Ivy;
public abstract class IvyModel {
- private final Map MODEL = new HashMap();
+ private final Map model = new HashMap();
+
+ private Properties defaults;
- private Properties _defaults;
private IvyModelSettings settings;
public IvyModel(IvyModelSettings settings) {
@@ -38,7 +39,7 @@
}
public IvyTag getIvyTag(String tagName, String parentName) {
- Object tag = MODEL.get(tagName);
+ Object tag = model.get(tagName);
if (tag instanceof List) {
List all = (List) tag;
for (Iterator iter = all.iterator(); iter.hasNext();) {
@@ -53,9 +54,9 @@
}
private void loadDefaults() {
- _defaults = new Properties();
+ defaults = new Properties();
try {
- _defaults.load(IvyModel.class.getResourceAsStream("defaults.properties"));
+ defaults.load(IvyModel.class.getResourceAsStream("defaults.properties"));
} catch (IOException e) {
// should never never happen
settings.logError("The default properties could not be loaded", e);
@@ -63,7 +64,7 @@
}
public IvyTag getRootIvyTag() {
- return (IvyTag) MODEL.get(getRootIvyTagName());
+ return (IvyTag) model.get(getRootIvyTagName());
}
protected abstract String getRootIvyTagName();
@@ -71,40 +72,39 @@
protected Ivy getIvy() {
return settings.getIvyInstance();
}
-
+
public IvyModelSettings getSettings() {
return settings;
}
-
protected void addTag(String name, List list) {
- MODEL.put(name, list);
+ model.put(name, list);
}
protected void addTag(IvyTag ivyTag) {
- if (!MODEL.containsKey(ivyTag.getName())) {
- MODEL.put(ivyTag.getName(), ivyTag);
+ if (!model.containsKey(ivyTag.getName())) {
+ model.put(ivyTag.getName(), ivyTag);
for (Iterator it = ivyTag.getChilds().iterator(); it.hasNext();) {
IvyTag child = (IvyTag) it.next();
addTag(child);
}
} else {
- // the model already contains a tag for this name... maybe we should add it to a list,
- // but we still have problem of tags with infinite children hierarchy (like chain of chain)
- // where we need to stop adding children somewhere.
+ // the model already contains a tag for this name... maybe we should add it to a list,
+ // but we still have problem of tags with infinite children hierarchy (like chain of
+ // chain) where we need to stop adding children somewhere.
}
}
-
+
protected String getDefault(String name) {
- return _defaults.getProperty(name);
+ return defaults.getProperty(name);
}
public abstract IvyFile newIvyFile(String name, String content, int documentOffset);
public void refreshIfNeeded(IvyFile file) {
}
-
+
protected void clearModel() {
- MODEL.clear();
+ model.clear();
}
}
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTag.java Sat Sep 6 08:06:53 2008
@@ -17,91 +17,89 @@
*/
package org.apache.ivyde.common.model;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.MissingResourceException;
-import java.util.Properties;
import java.util.ResourceBundle;
import java.util.Set;
public class IvyTag {
- private final static ResourceBundle doc = ResourceBundle.getBundle(
+ private static final ResourceBundle DOC_RESOURCE = ResourceBundle.getBundle(
IvyTag.class.getPackage().getName() + ".tagsdoc");
- private IvyTag _parent;
+ private IvyTag parent;
- private String _name;
+ private String name;
- private String _doc;
+ private String doc;
- private Map _attributes = new HashMap();
+ private Map attributes = new HashMap();
- private List _childs = new ArrayList();
+ private List childs = new ArrayList();
- private boolean _allowNoChild = true;
+ private boolean allowNoChild = true;
/**
* @param name
*/
public IvyTag(String name) {
super();
- _name = name;
+ this.name = name;
}
public IvyTag(String name, IvyTagAttribute[] atts) {
super();
- _name = name;
+ this.name = name;
for (int i = 0; i < atts.length; i++) {
addAttribute(atts[i]);
}
}
public IvyTag(String name, String doc) {
- _name = name;
- _doc = doc;
+ this.name = name;
+ this.doc = doc;
}
public IvyTag(String name, String doc, IvyTagAttribute[] atts) {
- _name = name;
- _doc = doc;
+ this.name = name;
+ this.doc = doc;
for (int i = 0; i < atts.length; i++) {
addAttribute(atts[i]);
}
}
public String getName() {
- return _name;
+ return name;
}
public void setName(String name) {
- _name = name;
+ this.name = name;
}
public void addAttribute(IvyTagAttribute attribute) {
attribute.setContainer(this);
- _attributes.put(attribute.getName(), attribute);
+ attributes.put(attribute.getName(), attribute);
}
public IvyTag addChildIvyTag(IvyTag att) {
att.setParent(this);
- _childs.add(att);
+ childs.add(att);
return this;
}
public boolean hasChild() {
- return _childs.size() > 0;
+ return childs.size() > 0;
}
public List getAttributes() {
- return new ArrayList(_attributes.values());
+ return new ArrayList(attributes.values());
}
public List getChilds() {
- return _childs;
+ return childs;
}
public String getEndTag() {
@@ -117,14 +115,14 @@
}
public String getDoc() {
- if (_doc == null) {
+ if (doc == null) {
try {
- _doc = doc.getString(getId());
+ doc = DOC_RESOURCE.getString(getId());
} catch (MissingResourceException ex) {
- _doc = "";
+ doc = "";
}
}
- return _doc;
+ return doc;
}
public String getId() {
@@ -135,23 +133,23 @@
}
public void setDoc(String doc) {
- _doc = doc;
+ this.doc = doc;
}
public IvyTag getParent() {
- return _parent;
+ return parent;
}
void setParent(IvyTag parent) {
- _parent = parent;
+ this.parent = parent;
}
public String toString() {
- return _name;
+ return name;
}
public String[] getPossibleValuesForAttribute(String att, IvyFile ivyfile) {
- IvyTagAttribute ivyTagAttribute = (IvyTagAttribute) _attributes.get(att);
+ IvyTagAttribute ivyTagAttribute = (IvyTagAttribute) attributes.get(att);
if (ivyTagAttribute == null) {
return null;
}
@@ -177,11 +175,11 @@
}
public boolean isAllowNoChild() {
- return _allowNoChild;
+ return allowNoChild;
}
public void setAllowNoChild(boolean allowNoChild) {
- _allowNoChild = allowNoChild;
+ this.allowNoChild = allowNoChild;
}
public Proposal[] getProposals() {
@@ -192,7 +190,7 @@
int cursor = getStartTag().length();
ret.add(new Proposal(text, cursor, getDoc()));
- if (_allowNoChild && getChilds().size() > 0) {
+ if (allowNoChild && getChilds().size() > 0) {
ret.add(new Proposal("<" + getName() + " />", cursor, getDoc()));
}
return (Proposal[]) ret.toArray(new Proposal[ret.size()]);
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTagAttribute.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTagAttribute.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTagAttribute.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/IvyTagAttribute.java Sat Sep 6 08:06:53 2008
@@ -21,79 +21,79 @@
import java.util.ResourceBundle;
public class IvyTagAttribute {
- private final static ResourceBundle doc = ResourceBundle.getBundle(
- IvyTagAttribute.class.getPackage().getName() + ".tagsdoc");
-
- private IvyTag _container;
+ private static final ResourceBundle DOC_RESOURCE = ResourceBundle
+ .getBundle(IvyTagAttribute.class.getPackage().getName() + ".tagsdoc");
- private String _name;
+ private IvyTag container;
- private String _doc;
+ private String name;
- private boolean _mandatory = false;
+ private String doc;
- private IValueProvider _valueProvider = null;
+ private boolean mandatory = false;
+
+ private IValueProvider valueProvider = null;
/**
* @param name
*/
public IvyTagAttribute(String name) {
super();
- _name = name;
+ this.name = name;
}
public IvyTagAttribute(String name, IValueProvider vp) {
super();
- _name = name;
- _valueProvider = vp;
+ this.name = name;
+ this.valueProvider = vp;
}
public IvyTagAttribute(String name, String doc) {
super();
- _name = name;
- _doc = doc;
+ this.name = name;
+ this.doc = doc;
}
public IvyTagAttribute(String name, boolean mandatory) {
- _name = name;
- _mandatory = mandatory;
+ this.name = name;
+ this.mandatory = mandatory;
}
public IvyTagAttribute(String name, String doc, boolean mandatory) {
super();
- _name = name;
- _doc = doc;
- _mandatory = mandatory;
+ this.name = name;
+ this.doc = doc;
+ this.mandatory = mandatory;
}
public IvyTagAttribute(String name, String doc, boolean mandatory, IValueProvider provider) {
- _name = name;
- _doc = doc;
- _mandatory = mandatory;
- _valueProvider = provider;
+ this.name = name;
+ this.doc = doc;
+ this.mandatory = mandatory;
+ this.valueProvider = provider;
}
public String getName() {
- return _name;
+ return this.name;
}
public void setName(String name) {
- _name = name;
+ this.name = name;
}
public String toString() {
- return _name;
+ return name;
}
public String getDoc() {
- if (_doc == null) {
+ if (doc == null) {
try {
- _doc = doc.getString(getId());
+ doc = DOC_RESOURCE.getString(getId());
} catch (MissingResourceException ex) {
- _doc = "";
+ doc = "";
}
}
- return _doc;
+ return doc;
}
private String getId() {
@@ -104,30 +104,30 @@
}
public void setDoc(String doc) {
- _doc = doc;
+ this.doc = doc;
}
public IvyTag getContainer() {
- return _container;
+ return container;
}
public void setContainer(IvyTag container) {
- _container = container;
+ this.container = container;
}
public boolean isMandatory() {
- return _mandatory;
+ return mandatory;
}
public void setMandatory(boolean mandatory) {
- _mandatory = mandatory;
+ this.mandatory = mandatory;
}
public IValueProvider getValueProvider() {
- return _valueProvider;
+ return valueProvider;
}
public void setValueProvider(IValueProvider valueProvider) {
- _valueProvider = valueProvider;
+ this.valueProvider = valueProvider;
}
}
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/ListValueProvider.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/ListValueProvider.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/ListValueProvider.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/ListValueProvider.java Sat Sep 6 08:06:53 2008
@@ -19,7 +19,7 @@
public class ListValueProvider implements IValueProvider {
- private String[] _values;
+ private String[] values;
public ListValueProvider(String commaSeparatedValuesList) {
if (commaSeparatedValuesList != null) {
@@ -33,19 +33,19 @@
}
}
- private void init(String[] values, boolean trim) {
- _values = new String[values.length];
+ private void init(String[] v, boolean trim) {
+ values = new String[v.length];
if (trim) {
- for (int i = 0; i < values.length; i++) {
- _values[i] = values[i].trim();
+ for (int i = 0; i < v.length; i++) {
+ values[i] = v[i].trim();
}
} else {
- System.arraycopy(values, 0, _values, 0, values.length);
+ System.arraycopy(v, 0, values, 0, v.length);
}
}
public String[] getValuesfor(IvyTagAttribute att, IvyFile ivyFile) {
- return _values;
+ return values;
}
}
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/Proposal.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/Proposal.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/Proposal.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/common/model/Proposal.java Sat Sep 6 08:06:53 2008
@@ -18,28 +18,28 @@
package org.apache.ivyde.common.model;
public class Proposal {
- private int _cursor;
+ private int cursor;
- private String _proposal;
+ private String proposal;
- private String _doc;
+ private String doc;
public Proposal(String proposal, int cursor, String doc) {
- _cursor = cursor;
- _proposal = proposal;
- _doc = doc;
+ this.cursor = cursor;
+ this.proposal = proposal;
+ this.doc = doc;
}
public int getCursor() {
- return _cursor;
+ return cursor;
}
public String getProposal() {
- return _proposal;
+ return proposal;
}
public String getDoc() {
- return _doc;
+ return doc;
}
}
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyDEException.java Sat Sep 6 08:06:53 2008
@@ -22,10 +22,8 @@
import org.eclipse.jface.dialogs.MessageDialog;
/**
- * Exception that will be displayed somehow to the end user.
- *
- * Once catched, depending of the context the error could be popuped or just logged
- *
+ * Exception that will be displayed somehow to the end user. Once catched, depending of the context
+ * the error could be popuped or just logged
*/
public class IvyDEException extends Exception {
@@ -78,6 +76,9 @@
MessageDialog.openInformation(IvyPlugin.getActiveWorkbenchShell(), title,
msg);
return;
+ default:
+ IvyPlugin.log(IStatus.WARNING, "Unsupported IvyDE error status: " + status,
+ null);
}
}
});
@@ -116,6 +117,8 @@
case IStatus.INFO:
Message.info("IVYDE: " + msg);
return;
+ default:
+ IvyPlugin.log(IStatus.WARNING, "Unsupported IvyDE error status: " + status, null);
}
}
}
Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java?rev=692658&r1=692657&r2=692658&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/IvyPlugin.java Sat Sep 6 08:06:53 2008
@@ -256,9 +256,10 @@
*/
public ResourceBundle getResourceBundle() {
try {
- if (resourceBundle == null)
+ if (resourceBundle == null) {
resourceBundle = ResourceBundle
.getBundle("org.apache.ivyde.eclipse.IvyPluginResources");
+ }
} catch (MissingResourceException x) {
resourceBundle = new ResourceBundle() {
protected Object handleGetObject(String key) {
@@ -285,7 +286,7 @@
return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
}
- private PreferenceStoreInfo _packageExtraInfo;
+ private PreferenceStoreInfo packageExtraInfo;
/**
* @return the helper around the plugin preference store
@@ -307,10 +308,10 @@
}
public IPackageFragmentExtraInfo getPackageFragmentExtraInfo() {
- if (_packageExtraInfo == null) {
- _packageExtraInfo = new PreferenceStoreInfo(getPreferenceStore());
+ if (packageExtraInfo == null) {
+ packageExtraInfo = new PreferenceStoreInfo(getPreferenceStore());
}
- return _packageExtraInfo;
+ return packageExtraInfo;
}
public BundleContext getBundleContext() {
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=692658&r1=692657&r2=692658&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 Sat Sep 6 08:06:53 2008
@@ -56,15 +56,15 @@
*/
public class IvyClasspathContainer implements IClasspathContainer {
- public static final String IVY_CLASSPATH_CONTAINER_ID = "org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER";
+ public static final String CONTAINER_ID = "org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER";
- IClasspathEntry[] classpathEntries;
+ private IClasspathEntry[] classpathEntries;
private IPath path;
- IvyResolveJob job;
+ private IvyResolveJob job;
- IvyClasspathContainerConfiguration conf;
+ private IvyClasspathContainerConfiguration conf;
private String jdtVersion;
@@ -122,7 +122,7 @@
return classpathEntries;
}
- private final static ISchedulingRule RESOLVE_EVENT_RULE = new ISchedulingRule() {
+ private static final ISchedulingRule RESOLVE_EVENT_RULE = new ISchedulingRule() {
public boolean contains(ISchedulingRule rule) {
return rule == this;
}
@@ -260,4 +260,8 @@
}
}
+ public void resetJob() {
+ job = null;
+ }
+
}