diff options
author | Brian Vosburgh | 2015-12-03 22:25:50 +0000 |
---|---|---|
committer | Brian Vosburgh | 2015-12-03 22:25:50 +0000 |
commit | bfe53338e6aca78beee3476a7c122df41b933e3d (patch) | |
tree | 1111ad63186b93b5b62e142957b412bb5a99b1f1 /jpa | |
parent | bab2a16b01710278afeda505fc49f776c8fc6e2e (diff) | |
download | webtools.dali-bfe53338e6aca78beee3476a7c122df41b933e3d.tar.gz webtools.dali-bfe53338e6aca78beee3476a7c122df41b933e3d.tar.xz webtools.dali-bfe53338e6aca78beee3476a7c122df41b933e3d.zip |
remove JavaConverter.dispose() - apparently no longer needed
Diffstat (limited to 'jpa')
9 files changed, 9 insertions, 30 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java index 860ba5358a..78a2098695 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2013 Oracle. All rights reserved. + * Copyright (c) 2008, 2015 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. @@ -37,12 +37,6 @@ public interface JavaConverter Annotation getConverterAnnotation(); - /** - * Allow the converter to clean up any related annotations before it is - * removed itself. - */ - void dispose(); - // ********** parent adapter ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java index 8536c15eb7..53b65712ee 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2013 Oracle. All rights reserved. + * Copyright (c) 2006, 2015 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. @@ -200,7 +200,6 @@ public abstract class AbstractJavaBasicMapping public void setConverter(Class<? extends Converter> converterType) { if (this.converter.getConverterType() != converterType) { - this.converter.dispose(); JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType); this.retainConverterAnnotation(converterAdapter); this.setConverter_(this.buildConverter(converterAdapter)); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java index d62ac13050..b5c0857c97 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2013 Oracle. All rights reserved. + * Copyright (c) 2006, 2015 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. @@ -213,7 +213,6 @@ public abstract class AbstractJavaIdMapping public void setConverter(Class<? extends Converter> converterType) { if (this.converter.getConverterType() != converterType) { - this.converter.dispose(); JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType); this.retainConverterAnnotation(converterAdapter); this.setConverter_(this.buildConverter(converterAdapter)); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index 1bf401acf9..842ea7a1cf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2013 Oracle. All rights reserved. + * Copyright (c) 2006, 2015 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. @@ -582,7 +582,6 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi public void setMapKeyConverter(Class<? extends Converter> converterType) { if (this.mapKeyConverter.getConverterType() != converterType) { - this.mapKeyConverter.dispose(); JavaConverter.Adapter converterAdapter = this.getKeyConverterAdapter(converterType); this.retainMapKeyConverterAnnotation(converterAdapter); this.setMapKeyConverter_(this.buildMapKeyConverter(converterAdapter)); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java index f686ac8d43..858429829f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 Oracle. All rights reserved. + * Copyright (c) 2007, 2015 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. @@ -100,7 +100,6 @@ public abstract class AbstractJavaVersionMapping public void setConverter(Class<? extends Converter> converterType) { if (this.converter.getConverterType() != converterType) { - this.converter.dispose(); JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType); this.retainConverterAnnotation(converterAdapter); this.setConverter_(this.buildConverter(converterAdapter)); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.java index dfe530434a..437d229f6e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2013 Oracle. All rights reserved. + * Copyright (c) 2010, 2015 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,8 +59,4 @@ public abstract class AbstractJavaConverter protected JavaResourceAttribute getResourceAttribute() { return this.getAttributeMapping().getResourceAttribute(); } - - public void dispose() { - // NOP - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java index 1e3007d017..73531ba76d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2013 Oracle. All rights reserved. + * Copyright (c) 2010, 2015 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. @@ -32,10 +32,6 @@ public class NullJavaConverter return null; } - public void dispose() { - // NOP - } - public TextRange getValidationTextRange() { return this.parent.getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java index a5f4b7488f..6e06d6d24c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2013 Oracle. All rights reserved. + * Copyright (c) 2009, 2015 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. @@ -488,7 +488,6 @@ public abstract class AbstractJavaElementCollectionMapping2_0 public void setConverter(Class<? extends Converter> converterType) { if (this.converter.getConverterType() != converterType) { - this.converter.dispose(); JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType); this.retainConverterAnnotation(converterAdapter); this.setConverter_(this.buildConverter(converterAdapter)); @@ -942,7 +941,6 @@ public abstract class AbstractJavaElementCollectionMapping2_0 public void setMapKeyConverter(Class<? extends Converter> converterType) { if (this.mapKeyConverter.getConverterType() != converterType) { - this.mapKeyConverter.dispose(); JavaConverter.Adapter converterAdapter = this.getMapKeyConverterAdapter(converterType); this.retainMapKeyConverterAnnotation(converterAdapter); this.setMapKeyConverter_(this.buildKeyConverter(converterAdapter)); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java index 6196bdf02f..f80c9f5751 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * Copyright (c) 2011, 2015 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. @@ -111,7 +111,6 @@ public class EclipseLinkJavaArrayMapping2_3 public void setConverter(Class<? extends Converter> converterType) { if (this.converter.getConverterType() != converterType) { - this.converter.dispose(); JavaConverter.Adapter converterAdapter = this.getConverterAdapter(converterType); this.retainConverterAnnotation(converterAdapter); this.setConverter_(this.buildConverter(converterAdapter)); |