Author: markt
Date: Wed Jun 26 12:50:37 2013
New Revision: 1496909
URL: http://svn.apache.org/r1496909
Log:
Refactor - move DecoderEntry to new file
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/DecoderEntry.java (with
props)
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Added: tomcat/trunk/java/org/apache/tomcat/websocket/DecoderEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/DecoderEntry.java?rev=1496909&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/DecoderEntry.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/DecoderEntry.java Wed Jun 26
12:50:37 2013
@@ -0,0 +1,39 @@
+/*
+ * 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.tomcat.websocket;
+
+import javax.websocket.Decoder;
+
+public class DecoderEntry {
+
+ private final Class<?> clazz;
+ private final Class<? extends Decoder> decoderClazz;
+
+ public DecoderEntry(Class<?> clazz,
+ Class<? extends Decoder> decoderClazz) {
+ this.clazz = clazz;
+ this.decoderClazz = decoderClazz;
+ }
+
+ public Class<?> getClazz() {
+ return clazz;
+ }
+
+ public Class<? extends Decoder> getDecoderClazz() {
+ return decoderClazz;
+ }
+}
\ No newline at end of file
Propchange: tomcat/trunk/java/org/apache/tomcat/websocket/DecoderEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1496909&r1=1496908&r2=1496909&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Wed Jun 26 12:50:37
2013
@@ -409,27 +409,6 @@ public class Util {
}
}
- public static class DecoderEntry {
-
- private final Class<?> clazz;
- private final Class<? extends Decoder> decoderClazz;
-
- public DecoderEntry(Class<?> clazz,
- Class<? extends Decoder> decoderClazz) {
- this.clazz = clazz;
- this.decoderClazz = decoderClazz;
- }
-
- public Class<?> getClazz() {
- return clazz;
- }
-
- public Class<? extends Decoder> getDecoderClazz() {
- return decoderClazz;
- }
- }
-
-
private static class DecoderMatch {
private final List<Class<? extends Decoder>> textDecoders =
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1496909&r1=1496908&r2=1496909&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Wed Jun 26 12:50:37 2013
@@ -44,8 +44,8 @@ import javax.websocket.Session;
import javax.websocket.server.PathParam;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.websocket.DecoderEntry;
import org.apache.tomcat.websocket.Util;
-import org.apache.tomcat.websocket.Util.DecoderEntry;
/**
* For a POJO class annotated with
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
