Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-07-24 18:16:09 +0000
committerEike Stepper2012-07-24 18:16:09 +0000
commitf543f2283be745f830be1634c6c77702e688f4d0 (patch)
tree8576cc92622902d020d1576c85335a80dd375568 /plugins
parent3bbc1c413a97d4484834a551851ab33134659eb2 (diff)
downloadcdo-f543f2283be745f830be1634c6c77702e688f4d0.tar.gz
cdo-f543f2283be745f830be1634c6c77702e688f4d0.tar.xz
cdo-f543f2283be745f830be1634c6c77702e688f4d0.zip
Cleanup code
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionBuilder.java28
1 files changed, 11 insertions, 17 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionBuilder.java b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionBuilder.java
index f1bb5612bf..1e5417d872 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionBuilder.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionBuilder.java
@@ -171,10 +171,11 @@ public class VersionBuilder extends IncrementalProjectBuilder implements Element
release = ReleaseManager.INSTANCE.getRelease(file);
}
- boolean releaseHasChanged = !release.getTag().equals(buildState.getReleaseTag());
+ String tag = release.getTag();
+ boolean releaseHasChanged = !tag.equals(buildState.getReleaseTag());
if (releaseHasChanged)
{
- buildState.setReleaseTag(release.getTag());
+ buildState.setReleaseTag(tag);
fullBuild = true;
}
@@ -302,6 +303,11 @@ public class VersionBuilder extends IncrementalProjectBuilder implements Element
{
Class<?> c = Class.forName(validatorClass, true, VersionBuilder.class.getClassLoader());
validator = (VersionValidator)c.newInstance();
+
+ if (DEBUG)
+ {
+ System.out.println(validator.getClass().getName() + ": " + project.getName());
+ }
}
catch (Exception ex)
{
@@ -310,11 +316,6 @@ public class VersionBuilder extends IncrementalProjectBuilder implements Element
return buildDpependencies.toArray(new IProject[buildDpependencies.size()]);
}
- if (DEBUG)
- {
- System.out.println(validator.getClass().getName() + ": " + project.getName());
- }
-
/*
* Do the validation
*/
@@ -328,17 +329,10 @@ public class VersionBuilder extends IncrementalProjectBuilder implements Element
validator.updateBuildState(buildState, releasePath, release, project, delta, componentModel, monitor);
- try
+ if (buildState.isChangedSinceRelease())
{
- if (buildState.isChangedSinceRelease())
- {
- addVersionMarker("Version must be increased to " + nextImplVersion
- + " because the project's contents have changed");
- }
- }
- catch (Exception ignore)
- {
- Activator.log(ignore);
+ addVersionMarker("Version must be increased to " + nextImplVersion
+ + " because the project's contents have changed");
}
}
catch (Exception ex)

Back to the top