cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1461778 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Date Wed, 27 Mar 2013 18:42:56 GMT
Author: sergeyb
Date: Wed Mar 27 18:42:55 2013
New Revision: 1461778

URL: http://svn.apache.org/r1461778
Log:
Merged revisions 1461774 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1461774 | sergeyb | 2013-03-27 21:38:45 +0300 (Wed, 27 Mar 2013) | 1 line
  
  Making few of WADLGenerator methods protected
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1461774

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1461778&r1=1461777&r2=1461778&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Wed Mar 27 18:42:55 2013
@@ -281,7 +281,7 @@ public class WadlGenerator implements Re
         }
     }
     
-    private void handleGrammars(StringBuilder sbApp, StringBuilder sbGrammars,
+    protected void handleGrammars(StringBuilder sbApp, StringBuilder sbGrammars,
                                 SchemaWriter writer, Map<Class<?>, QName> clsMap)
{
         if (writer == null) {
             return;
@@ -300,7 +300,7 @@ public class WadlGenerator implements Re
     }
 
 
-    private void handleResource(StringBuilder sb, Set<Class<?>> jaxbTypes,
+    protected void handleResource(StringBuilder sb, Set<Class<?>> jaxbTypes,
                                 ElementQNameResolver qnameResolver,
                                 Map<Class<?>, QName> clsMap, ClassResourceInfo
cri,
                                 Set<ClassResourceInfo> visitedResources,
@@ -369,7 +369,7 @@ public class WadlGenerator implements Re
         sb.append(">");
     }
 
-    private String getPath(String path) {
+    protected String getPath(String path) {
         String thePath = null;
         if (ignoreForwardSlash && path.startsWith("/") && path.length() >
0) {
             thePath = path.substring(1);
@@ -391,7 +391,7 @@ public class WadlGenerator implements Re
     }
 
     //CHECKSTYLE:OFF
-    private boolean handleOperation(StringBuilder sb, Set<Class<?>> jaxbTypes,
+    protected boolean handleOperation(StringBuilder sb, Set<Class<?>> jaxbTypes,
                                  ElementQNameResolver qnameResolver,
                                  Map<Class<?>, QName> clsMap,
                                  OperationResourceInfo ori,
@@ -521,13 +521,13 @@ public class WadlGenerator implements Re
         sb.append("</resource>");
     }
 
-    private void handlePathAndMatrixClassParams(StringBuilder sb, Map<Parameter, Object>
params,
+    protected void handlePathAndMatrixClassParams(StringBuilder sb, Map<Parameter, Object>
params,
             boolean isJson) {
         doHandleClassParams(sb, params, isJson, ParameterType.PATH);
         doHandleClassParams(sb, params, isJson, ParameterType.MATRIX);
     }
     
-    private void doHandleClassParams(StringBuilder sb, Map<Parameter, Object> params,
+    protected void doHandleClassParams(StringBuilder sb, Map<Parameter, Object> params,
                                      boolean isJson, ParameterType... pType) {
         Set<ParameterType> pTypes = new LinkedHashSet<ParameterType>(Arrays.asList(pType));
         for (Map.Entry<Parameter, Object> entry : params.entrySet()) {
@@ -545,13 +545,13 @@ public class WadlGenerator implements Re
         }
     }
     
-    private void handlePathAndMatrixParams(StringBuilder sb, OperationResourceInfo ori, boolean
isJson) {
+    protected void handlePathAndMatrixParams(StringBuilder sb, OperationResourceInfo ori,
boolean isJson) {
         handleParams(sb, ori, ParameterType.PATH, isJson);
         handleParams(sb, ori, ParameterType.MATRIX, isJson);
     }
 
 
-    private void handleParameter(StringBuilder sb, Set<Class<?>> jaxbTypes,
+    protected void handleParameter(StringBuilder sb, Set<Class<?>> jaxbTypes,
                                  ElementQNameResolver qnameResolver,
                                  Map<Class<?>, QName> clsMap, OperationResourceInfo
ori, Parameter pm,
                                  boolean isJson) {
@@ -569,7 +569,7 @@ public class WadlGenerator implements Re
 
     }
 
-    private void handleParams(StringBuilder sb, OperationResourceInfo ori, ParameterType
type, 
+    protected void handleParams(StringBuilder sb, OperationResourceInfo ori, ParameterType
type, 
             boolean isJson) {
         for (Parameter pm : ori.getParameters()) {
             if (pm.getType() == type) {



Mime
View raw message