You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by gs...@apache.org on 2008/04/18 17:06:47 UTC

svn commit: r649561 - in /labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing: EntityImpl.java stringprep/NodePrep.java stringprep/ResourcePrep.java stringprep/StringPrep.java

Author: gseitz
Date: Fri Apr 18 08:06:44 2008
New Revision: 649561

URL: http://svn.apache.org/viewvc?rev=649561&view=rev
Log:
shorter name for static methods

Modified:
    labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java
    labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java?rev=649561&r1=649560&r2=649561&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/EntityImpl.java Fri Apr 18 08:06:44 2008
@@ -40,7 +40,7 @@
 				throw new EntityFormatException(
 						"entity must be of format node@domain/resource");
 			node = parts[0];
-			node = NodePrep.prepareNode(node);
+			node = NodePrep.prepare(node);
 			entity = parts[1];
 		}
 		domain = entity;
@@ -48,7 +48,7 @@
 			int indexOfSlash = entity.indexOf("/");
 			domain = entity.substring(0, indexOfSlash);
 			resource = entity.substring(indexOfSlash);
-			resource = ResourcePrep.prepareResource(resource);
+			resource = ResourcePrep.prepare(resource);
 		}
 		return new EntityImpl(node, domain, resource);
 	}

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java?rev=649561&r1=649560&r2=649561&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java Fri Apr 18 08:06:44 2008
@@ -19,7 +19,7 @@
 @RfcCompliant(rfc = "3920", section = "A", status = ComplianceStatus.PARTIAL)
 public class NodePrep extends StringPrep {
 
-	private static final StringPrep INSTANCE = new NodePrep();
+	private static final NodePrep INSTANCE = new NodePrep();
 
 	/**
 	 * Applies the Nodeprep profile to the given node.
@@ -30,9 +30,9 @@
 	 * @throws StringPrepViolationException
 	 *             in case the Nodeprep profile can't be applied
 	 */
-	public static final String prepareNode(String node)
+	public static final String prepare(String node)
 			throws StringPrepViolationException {
-		return INSTANCE.prepare(node);
+		return INSTANCE.prepareString(node);
 	}
 
 	private NodePrep() {

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java?rev=649561&r1=649560&r2=649561&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java Fri Apr 18 08:06:44 2008
@@ -29,9 +29,9 @@
 	 * @throws StringPrepViolationException
 	 *             in case the Resourceprep profile can't be applied
 	 */
-	public static String prepareResource(String resource)
+	public static String prepare(String resource)
 			throws StringPrepViolationException {
-		return INSTANCE.prepare(resource);
+		return INSTANCE.prepareString(resource);
 	}
 
 	private ResourcePrep() {

Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java?rev=649561&r1=649560&r2=649561&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java Fri Apr 18 08:06:44 2008
@@ -41,7 +41,7 @@
 	 * @throws StringPrepViolationException
 	 *             in case the {@link String} cannot be prepared
 	 */
-	public String prepare(String str) throws StringPrepViolationException {
+	public String prepareString(String str) throws StringPrepViolationException {
 		// 1. map -> RFC3454:3
 		for (int i = 0; i < str.length(); i++) {
 			String codePoint = codePointAt(str, i);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org