From 337c78261d23263486c767031080fae8ce973ebf Mon Sep 17 00:00:00 2001 From: "Peter J. Radics" Date: Wed, 15 Oct 2014 19:48:36 -0400 Subject: [PATCH] Changes to assure Java 1.6 compliance. --- .../org/jutility/io/ConversionException.java | 21 ------- .../jutility/io/SerializationException.java | 21 ------- .../jutility/io/xml/XmlColorTypeAdapter.java | 61 ------------------- .../org/jutility/io/xml/package-info.java | 23 ++++--- 4 files changed, 13 insertions(+), 113 deletions(-) delete mode 100644 src/main/java/org/jutility/io/xml/XmlColorTypeAdapter.java diff --git a/src/main/java/org/jutility/io/ConversionException.java b/src/main/java/org/jutility/io/ConversionException.java index 288ba92..16a30ef 100644 --- a/src/main/java/org/jutility/io/ConversionException.java +++ b/src/main/java/org/jutility/io/ConversionException.java @@ -80,25 +80,4 @@ public ConversionException(String message, Throwable cause) { super(message, cause); } - - /** - * Creates a new instance of a conversion exception with the provided - * message and cause. Provides ability to enable suppression and enable - * writing on the stack trace. - * - * @param message - * the exception message. - * @param cause - * the cause of the exception. - * @param enableSuppression - * whether or not suppression is enabled. - * @param writableStackTrace - * whether or not the stack trace is writable. - */ - public ConversionException(String message, Throwable cause, - boolean enableSuppression, boolean writableStackTrace) { - - super(message, cause, enableSuppression, writableStackTrace); - } - } diff --git a/src/main/java/org/jutility/io/SerializationException.java b/src/main/java/org/jutility/io/SerializationException.java index 3089612..5e8919a 100644 --- a/src/main/java/org/jutility/io/SerializationException.java +++ b/src/main/java/org/jutility/io/SerializationException.java @@ -85,25 +85,4 @@ public SerializationException(String message, Throwable cause) { super(message, cause); } - - /** - * Creates a new instance of a serialization exception with the provided - * message and cause. Provides ability to enable suppression and enable - * writing on the stack trace. - * - * @param message - * the exception message. - * @param cause - * the cause of the exception. - * @param enableSuppression - * whether or not suppression is enabled. - * @param writableStackTrace - * whether or not the stack trace is writable. - */ - public SerializationException(String message, Throwable cause, - boolean enableSuppression, boolean writableStackTrace) { - - super(message, cause, enableSuppression, writableStackTrace); - } - } diff --git a/src/main/java/org/jutility/io/xml/XmlColorTypeAdapter.java b/src/main/java/org/jutility/io/xml/XmlColorTypeAdapter.java deleted file mode 100644 index 3f9b8a4..0000000 --- a/src/main/java/org/jutility/io/xml/XmlColorTypeAdapter.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.jutility.io.xml; - -/* - * #%L - * jutility-io - * %% - * Copyright (C) 2013 - 2014 jutility.org - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - - -import javafx.scene.paint.Color; - -import javax.xml.bind.annotation.adapters.XmlAdapter; - - -/** - * The {@code XmlColorTypeAdapter} class provides an adapter for XML - * serialization of {@link Color Colors}. - * - * @author Peter J. Radics - * @version 1.0 - * - */ -public class XmlColorTypeAdapter - extends XmlAdapter { - - @Override - public String marshal(Color color) - throws Exception { - - if (color != null) { - return color.toString(); - } - return null; - } - - @Override - public Color unmarshal(String serializedColor) - throws Exception { - - if (serializedColor != null) { - Color color = Color.web(serializedColor); - return color; - } - return null; - } - -} diff --git a/src/main/java/org/jutility/io/xml/package-info.java b/src/main/java/org/jutility/io/xml/package-info.java index 1f1e035..ebe7be3 100644 --- a/src/main/java/org/jutility/io/xml/package-info.java +++ b/src/main/java/org/jutility/io/xml/package-info.java @@ -1,13 +1,3 @@ -/** - * * This package contains all the classes required for XML I/O. - * - * @author Peter J. Radics - * @version 1.0 - * @since 1.0 - * - */ -package org.jutility.io.xml; - /* * #%L * jutility-io @@ -27,3 +17,16 @@ * limitations under the License. * #L% */ + +/** + * This package contains all the classes required for XML I/O. + * + * @author Peter J. Radics + * @version 1.0 + * @since 1.0 + * + */ +package org.jutility.io.xml; + + +