diff options
Diffstat (limited to 'plugins')
2 files changed, 15 insertions, 15 deletions
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/MigrateModelTask.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/MigrateModelTask.java index a30ab1662a..fd1229ef36 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/MigrateModelTask.java +++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/MigrateModelTask.java @@ -24,13 +24,13 @@ import java.io.File; */ public class MigrateModelTask extends CDOTask { - private File location; + private File modelLocation; private boolean dynamicFeatureDelegation; - public void setLocation(File location) + public void setModelLocation(File modelLocation) { - this.location = location; + this.modelLocation = modelLocation; } public void setDynamicFeatureDelegation(boolean dynamicFeatureDelegation) @@ -41,14 +41,14 @@ public class MigrateModelTask extends CDOTask @Override protected void checkAttributes() throws BuildException { - assertTrue("'location' must be specified.", location != null); - assertTrue("'location' must be point to an existing file.", location.isFile()); + assertTrue("'modelLocation' must be specified.", modelLocation != null); + assertTrue("'modelLocation' must be point to an existing file.", modelLocation.isFile()); } @Override protected void doExecute() throws Exception { - GenModel genModel = CDOMigratorUtil.getGenModel(location.getAbsolutePath()); + GenModel genModel = CDOMigratorUtil.getGenModel(modelLocation.getAbsolutePath()); GenDelegationKind featureDelegation = dynamicFeatureDelegation ? GenDelegationKind.DYNAMIC_LITERAL : GenDelegationKind.REFLECTIVE_LITERAL; String result = CDOMigratorUtil.adjustGenModel(genModel, featureDelegation); diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectImportTask.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectImportTask.java index 1546aed0cd..4b23ee759d 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectImportTask.java +++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/tasks/ProjectImportTask.java @@ -27,24 +27,24 @@ public class ProjectImportTask extends CDOTask { private String projectName; - private File location; + private File fromLocation; public void setProjectName(String projectName) { this.projectName = projectName; } - public void setLocation(File location) + public void setFromLocation(File fromLocation) { - this.location = location; + this.fromLocation = fromLocation; } @Override protected void checkAttributes() throws BuildException { assertTrue("'projectName' must be specified.", projectName != null && projectName.length() != 0); - assertTrue("'location' must be specified.", location != null); - assertTrue("'location' must be point to an existing directory.", location.isDirectory()); + assertTrue("'fromLocation' must be specified.", fromLocation != null); + assertTrue("'fromLocation' must be point to an existing directory.", fromLocation.isDirectory()); } @Override @@ -54,17 +54,17 @@ public class ProjectImportTask extends CDOTask if (project.exists()) { File existingLocation = new File(project.getLocation().toOSString()).getCanonicalFile(); - if (!existingLocation.equals(location)) + if (!existingLocation.equals(fromLocation)) { throw new BuildException("Project " + projectName + " exists in different location: " + existingLocation); } - System.out.println("Project " + location + " is already imported."); + System.out.println("Project " + fromLocation + " is already imported."); return; } - System.out.println("Importing project " + location + " ..."); - IPath locationPath = new Path(location.getAbsolutePath()); + System.out.println("Importing project " + fromLocation + " ..."); + IPath locationPath = new Path(fromLocation.getAbsolutePath()); IProjectDescription projectDescription = workspace.newProjectDescription(projectName); projectDescription.setLocation(locationPath); |