You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/11/24 01:12:18 UTC
svn commit: r597767 - in
/mina/trunk/core/src/main/java/org/apache/mina/integration/beans:
AbstractPropertyEditor.java InetAddressEditor.java
InetSocketAddressEditor.java VmPipeAddressEditor.java
Author: trustin
Date: Fri Nov 23 16:12:17 2007
New Revision: 597767
URL: http://svn.apache.org/viewvc?rev=597767&view=rev
Log:
Made property editors bi-directional
Added:
mina/trunk/core/src/main/java/org/apache/mina/integration/beans/AbstractPropertyEditor.java (with props)
Modified:
mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java
mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java
mina/trunk/core/src/main/java/org/apache/mina/integration/beans/VmPipeAddressEditor.java
Added: mina/trunk/core/src/main/java/org/apache/mina/integration/beans/AbstractPropertyEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/integration/beans/AbstractPropertyEditor.java?rev=597767&view=auto
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/integration/beans/AbstractPropertyEditor.java (added)
+++ mina/trunk/core/src/main/java/org/apache/mina/integration/beans/AbstractPropertyEditor.java Fri Nov 23 16:12:17 2007
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ *
+ */
+package org.apache.mina.integration.beans;
+
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorSupport;
+
+/**
+ * An abstract bi-directional {@link PropertyEditor}.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
+ */
+public abstract class AbstractPropertyEditor extends PropertyEditorSupport {
+
+ private String text;
+ private Object value;
+
+ @Override
+ public String getAsText() {
+ return text;
+ }
+
+ @Override
+ public Object getValue() {
+ return value;
+ }
+
+ @Override
+ public void setAsText(String text) throws IllegalArgumentException {
+ this.text = text;
+ if (text == null) {
+ value = null;
+ } else {
+ value = toValue(text.trim());
+ }
+ }
+
+ @Override
+ public void setValue(Object value) {
+ this.value = value;
+ if (value == null) {
+ text = null;
+ } else {
+ text = toText(value);
+ }
+ }
+
+ protected abstract String toText(Object value);
+ protected abstract Object toValue(String text) throws IllegalArgumentException;
+
+}
Propchange: mina/trunk/core/src/main/java/org/apache/mina/integration/beans/AbstractPropertyEditor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/trunk/core/src/main/java/org/apache/mina/integration/beans/AbstractPropertyEditor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java?rev=597767&r1=597766&r2=597767&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetAddressEditor.java Fri Nov 23 16:12:17 2007
@@ -19,7 +19,6 @@
*/
package org.apache.mina.integration.beans;
-import java.beans.PropertyEditorSupport;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -43,14 +42,16 @@
*
* @see java.net.InetAddress
*/
-public class InetAddressEditor extends PropertyEditorSupport {
+public class InetAddressEditor extends AbstractPropertyEditor {
@Override
- public void setAsText(String text) throws IllegalArgumentException {
- if (text == null) {
- throw new IllegalArgumentException("address is null.");
- }
+ protected String toText(Object value) {
+ return ((InetAddress) value).getHostAddress();
+ }
+
+ @Override
+ protected Object toValue(String text) throws IllegalArgumentException {
try {
- setValue(InetAddress.getByName(text));
+ return InetAddress.getByName(text);
} catch (UnknownHostException uhe) {
IllegalArgumentException iae = new IllegalArgumentException();
iae.initCause(uhe);
Modified: mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java?rev=597767&r1=597766&r2=597767&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java Fri Nov 23 16:12:17 2007
@@ -19,9 +19,7 @@
*/
package org.apache.mina.integration.beans;
-import java.beans.PropertyEditorSupport;
import java.net.InetSocketAddress;
-import java.net.SocketAddress;
/**
* Java Bean {@link java.beans.PropertyEditor} which converts Strings into
@@ -40,28 +38,39 @@
*
* @see java.net.InetSocketAddress
*/
-public class InetSocketAddressEditor extends PropertyEditorSupport {
- @Override
- public void setAsText(String text) throws IllegalArgumentException {
- setValue(parseSocketAddress(text));
- }
+public class InetSocketAddressEditor extends AbstractPropertyEditor {
- private SocketAddress parseSocketAddress(String s) {
- if (s == null) {
- throw new IllegalArgumentException("socketAddress is null.");
+ @Override
+ protected String toText(Object value) {
+ InetSocketAddress addr = ((InetSocketAddress) value);
+ String hostname;
+ if (addr.getAddress() != null) {
+ hostname = addr.getAddress().getHostAddress();
+ } else {
+ hostname = addr.getHostName();
+ }
+
+ if (hostname.equals("0:0:0:0:0:0:0:0") || hostname.equals("0.0.0.0") ||
+ hostname.equals("00:00:00:00:00:00:00:00")) {
+ hostname = "*";
}
- s = s.trim();
- int colonIndex = s.indexOf(":");
+ return hostname + ':' + addr.getPort();
+ }
+
+ @Override
+ protected Object toValue(String text) throws IllegalArgumentException {
+ text = text.trim();
+ int colonIndex = text.lastIndexOf(":");
if (colonIndex > 0) {
- String host = s.substring(0, colonIndex);
+ String host = text.substring(0, colonIndex);
if (!"*".equals(host)) {
- int port = parsePort(s.substring(colonIndex + 1));
+ int port = parsePort(text.substring(colonIndex + 1));
return new InetSocketAddress(host, port);
}
}
- int port = parsePort(s.substring(colonIndex + 1));
+ int port = parsePort(text.substring(colonIndex + 1));
return new InetSocketAddress(port);
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/integration/beans/VmPipeAddressEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/integration/beans/VmPipeAddressEditor.java?rev=597767&r1=597766&r2=597767&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/integration/beans/VmPipeAddressEditor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/integration/beans/VmPipeAddressEditor.java Fri Nov 23 16:12:17 2007
@@ -19,9 +19,6 @@
*/
package org.apache.mina.integration.beans;
-import java.beans.PropertyEditorSupport;
-import java.net.SocketAddress;
-
import org.apache.mina.transport.vmpipe.VmPipeAddress;
/**
@@ -39,24 +36,21 @@
*
* @see org.apache.mina.transport.vmpipe.VmPipeAddress
*/
-public class VmPipeAddressEditor extends PropertyEditorSupport {
+public class VmPipeAddressEditor extends AbstractPropertyEditor {
@Override
- public void setAsText(String text) throws IllegalArgumentException {
- setValue(parseSocketAddress(text));
+ protected String toText(Object value) {
+ return ":" + ((VmPipeAddress) value).getPort();
}
- private SocketAddress parseSocketAddress(String s) {
- if (s == null) {
- throw new IllegalArgumentException("socketAddress is null.");
- }
- s = s.trim();
- if (s.startsWith(":")) {
- s = s.substring(1);
+ @Override
+ protected Object toValue(String text) throws IllegalArgumentException {
+ if (text.startsWith(":")) {
+ text = text.substring(1);
}
try {
- return new VmPipeAddress(Integer.parseInt(s.trim()));
+ return new VmPipeAddress(Integer.parseInt(text.trim()));
} catch (NumberFormatException nfe) {
- throw new IllegalArgumentException("Illegal VmPipeAddress: " + s);
+ throw new IllegalArgumentException("Illegal VmPipeAddress: " + text);
}
}
}