diff options
author | kmoore | 2011-01-11 21:48:48 +0000 |
---|---|---|
committer | kmoore | 2011-01-11 21:48:48 +0000 |
commit | 6c69caca42007d221ae333ed3b127a6326672d2a (patch) | |
tree | f2dd59164617218b9b826ccb8381c8cdbd41ccdb | |
parent | 6c8358b3bb006b62aae6b83aedb2cbc844096d2f (diff) | |
download | webtools.dali-6c69caca42007d221ae333ed3b127a6326672d2a.tar.gz webtools.dali-6c69caca42007d221ae333ed3b127a6326672d2a.tar.xz webtools.dali-6c69caca42007d221ae333ed3b127a6326672d2a.zip |
rename getJaxbPlatform() to getPlatform()
9 files changed, 24 insertions, 24 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java index 36cedce77d..ff329900ca 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -72,7 +72,7 @@ public interface JaxbProject * Return the vendor-specific JAXB platform that builds the JAXB project * and its contents. */ - JaxbPlatform getJaxbPlatform(); + JaxbPlatform getPlatform(); /** * Return the schema library used for validating and user assist diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbNode.java index 144224feaf..fe0421a213 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbNode.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -114,8 +114,8 @@ public abstract class AbstractJaxbNode // ********** convenience methods ********** - protected JaxbPlatform getJaxbPlatform() { - return this.getJaxbProject().getJaxbPlatform(); + protected JaxbPlatform getPlatform() { + return this.getJaxbProject().getPlatform(); } // protected JaxbPlatform.Version getJaxbPlatformVersion() { @@ -123,7 +123,7 @@ public abstract class AbstractJaxbNode // } protected JaxbFactory getFactory() { - return this.getJaxbPlatform().getFactory(); + return this.getPlatform().getFactory(); } protected JaxbFile getJaxbFile(IFile file) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java index 99ccc1fd9f..01744abe48 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -298,7 +298,7 @@ public abstract class AbstractJaxbProject } @Override - public JaxbPlatform getJaxbPlatform() { + public JaxbPlatform getPlatform() { return this.jaxbPlatform; } @@ -376,7 +376,7 @@ public abstract class AbstractJaxbProject JaxbFile jaxbFile = null; try { - jaxbFile = this.getJaxbPlatform().buildJaxbFile(this, file); + jaxbFile = this.getPlatform().buildJaxbFile(this, file); } catch (Exception e) { //log any developer exceptions and don't build a JaxbFile rather diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaPackageInfoResourceModelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaPackageInfoResourceModelProvider.java index 78efe5520f..40c15c5ad4 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaPackageInfoResourceModelProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaPackageInfoResourceModelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -48,8 +48,8 @@ public class JavaPackageInfoResourceModelProvider public JavaResourceCompilationUnit buildResourceModel(JaxbProject jaxbProject, IFile file) { return new SourcePackageInfoCompilationUnit( JavaCore.createCompilationUnitFrom(file), - jaxbProject.getJaxbPlatform().getAnnotationProvider(), - jaxbProject.getJaxbPlatform().getAnnotationEditFormatter(), + jaxbProject.getPlatform().getAnnotationProvider(), + jaxbProject.getPlatform().getAnnotationEditFormatter(), jaxbProject.getModifySharedDocumentCommandExecutor() ); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaResourceModelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaResourceModelProvider.java index 73843ddca6..d6d87bab12 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaResourceModelProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/JavaResourceModelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -48,8 +48,8 @@ public class JavaResourceModelProvider public JavaResourceCompilationUnit buildResourceModel(JaxbProject jaxbProject, IFile file) { return new SourceTypeCompilationUnit( JavaCore.createCompilationUnitFrom(file), - jaxbProject.getJaxbPlatform().getAnnotationProvider(), - jaxbProject.getJaxbPlatform().getAnnotationEditFormatter(), + jaxbProject.getPlatform().getAnnotationProvider(), + jaxbProject.getPlatform().getAnnotationEditFormatter(), jaxbProject.getModifySharedDocumentCommandExecutor() ); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java index abff45978f..7acac3de74 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. + * Copyright (c) 2007, 2011 Oracle. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -109,7 +109,7 @@ public class JaxbNavigatorContentProvider if (project != null) { JaxbProject jaxbProject = JptJaxbCorePlugin.getJaxbProject(project); if (jaxbProject != null) { - JaxbPlatformDescription desc = jaxbProject.getJaxbPlatform().getDescription(); + JaxbPlatformDescription desc = jaxbProject.getPlatform().getDescription(); JaxbPlatformUi platformUi = JptJaxbUiPlugin.getJaxbPlatformUiManager().getJaxbPlatformUi(desc); @@ -132,7 +132,7 @@ public class JaxbNavigatorContentProvider if (project != null) { JaxbProject jaxbProject = JptJaxbCorePlugin.getJaxbProject(project); if (jaxbProject != null) { - JaxbPlatformDescription desc = jaxbProject.getJaxbPlatform().getDescription(); + JaxbPlatformDescription desc = jaxbProject.getPlatform().getDescription(); JaxbPlatformUi platformUi = JptJaxbUiPlugin.getJaxbPlatformUiManager().getJaxbPlatformUi(desc); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java index 6d8426596a..39fb79998a 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorItemLabelProviderFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 Oracle. All rights reserved. + * Copyright (c) 2008, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -59,7 +59,7 @@ public class JaxbNavigatorItemLabelProviderFactory return null; } - JaxbPlatformDescription platformDesc = contextNode.getJaxbProject().getJaxbPlatform().getDescription(); + JaxbPlatformDescription platformDesc = contextNode.getJaxbProject().getPlatform().getDescription(); if (delegates.containsKey(platformDesc)) { return delegates.get(platformDesc); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java index 9684a96fbe..b249c8a331 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorTreeItemContentProviderFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 Oracle. All rights reserved. + * Copyright (c) 2008, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -59,7 +59,7 @@ public class JaxbNavigatorTreeItemContentProviderFactory return null; } - JaxbPlatformDescription platformDesc = contextNode.getJaxbProject().getJaxbPlatform().getDescription(); + JaxbPlatformDescription platformDesc = contextNode.getJaxbProject().getPlatform().getDescription(); if (delegates.containsKey(platformDesc)) { return delegates.get(platformDesc); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java index b3a40cfab7..63114edf2f 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Oracle. All rights reserved. + * Copyright (c) 2007, 2011 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -294,7 +294,7 @@ public class JaxbProjectPropertiesPage @Override protected JaxbPlatformDescription buildValue_() { - return this.subject.getJaxbPlatform().getDescription(); + return this.subject.getPlatform().getDescription(); } @Override |