You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by cz...@apache.org on 2005/08/09 11:10:29 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/util StateChangedServiceImpl.java
cziegeler 2005/08/09 02:10:29
Modified: portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet
SessionHandler.java
portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl
ProducerRegistryImpl.java UserRegistryImpl.java
GroupSessionImpl.java PortletRegistryImpl.java
UserSessionImpl.java ResourceProxy.java
SessionHandlerImpl.java PortletSessionImpl.java
ConsumerEnvironmentImpl.java URLGeneratorImpl.java
URLTemplateComposerImpl.java WSRPRequestImpl.java
ProxyPortlet.java
src/org/apache/wsrp4j/persistence/driver
PersistentAccess.java
portlets/wsrptest/src/org/apache/wsrp4j/testportlet
TestPortlet.java
src/org/apache/wsrp4j/util StateChangedServiceImpl.java
Log:
Code formatting
Revision Changes Path
1.3 +3 -4 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/SessionHandler.java
Index: SessionHandler.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/SessionHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionHandler.java 9 Mar 2004 21:40:57 -0000 1.2
+++ SessionHandler.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet;
import javax.portlet.PortletSession;
-public interface SessionHandler extends org.apache.wsrp4j.consumer.SessionHandler
-{
- public void setPortletSession(PortletSession portletSession);
+public interface SessionHandler extends org.apache.wsrp4j.consumer.SessionHandler {
+
+ void setPortletSession(PortletSession portletSession);
}
1.3 +1 -2 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ProducerRegistryImpl.java
Index: ProducerRegistryImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ProducerRegistryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProducerRegistryImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ ProducerRegistryImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import org.apache.wsrp4j.consumer.ProducerRegistry;
@@ -27,7 +26,7 @@
{
//public class ProducerRegistryImpl extends GenericProducerRegistryImpl {
- private static ProducerRegistry instance = null;
+ private static ProducerRegistry instance;
private ProducerRegistryImpl(String path)
{
1.3 +1 -2 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/UserRegistryImpl.java
Index: UserRegistryImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/UserRegistryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserRegistryImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ UserRegistryImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import org.apache.wsrp4j.consumer.UserRegistry;
@@ -22,7 +21,7 @@
public class UserRegistryImpl extends GenericUserRegistryImpl
{
- private static UserRegistry instance = null;
+ private static UserRegistry instance;
private UserRegistryImpl()
{
1.3 +0 -1 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/GroupSessionImpl.java
Index: GroupSessionImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/GroupSessionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GroupSessionImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ GroupSessionImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import org.apache.wsrp4j.consumer.PortletSession;
1.3 +1 -2 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/PortletRegistryImpl.java
Index: PortletRegistryImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/PortletRegistryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletRegistryImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ PortletRegistryImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import org.apache.wsrp4j.consumer.PortletRegistry;
@@ -22,7 +21,7 @@
public class PortletRegistryImpl extends GenericPortletRegistryImpl
{
- private static PortletRegistry instance = null;
+ private static PortletRegistry instance;
private PortletRegistryImpl()
{
1.3 +2 -3 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/UserSessionImpl.java
Index: UserSessionImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/UserSessionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserSessionImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ UserSessionImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import java.util.Hashtable;
@@ -30,8 +29,8 @@
public class UserSessionImpl extends GenericUserSessionImpl
{
- private PortletSession portletSession = null;
- private Map userSession = null;
+ private PortletSession portletSession;
+ private Map userSession;
public UserSessionImpl(String producerID, String userID, String portletServicesURL, PortletSession portletSession) throws WSRPException
{
1.3 +0 -1 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ResourceProxy.java
Index: ResourceProxy.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ResourceProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceProxy.java 9 Mar 2004 21:40:57 -0000 1.2
+++ ResourceProxy.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import java.io.InputStream;
1.3 +3 -4 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/SessionHandlerImpl.java
Index: SessionHandlerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/SessionHandlerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionHandlerImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ SessionHandlerImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import javax.portlet.PortletSession;
@@ -27,10 +26,10 @@
public class SessionHandlerImpl implements SessionHandler
{
- private PortletSession portletSession = null;
- private ConsumerEnvironment consumerEnv = null;
+ private PortletSession portletSession;
+ private ConsumerEnvironment consumerEnv;
- private static SessionHandler instance = null;
+ private static SessionHandler instance;
private SessionHandlerImpl(ConsumerEnvironment consumerEnv)
{
1.3 +0 -1 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/PortletSessionImpl.java
Index: PortletSessionImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/PortletSessionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletSessionImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ PortletSessionImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import org.apache.wsrp4j.consumer.PortletWindowSession;
1.3 +2 -4 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ConsumerEnvironmentImpl.java
Index: ConsumerEnvironmentImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ConsumerEnvironmentImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConsumerEnvironmentImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ ConsumerEnvironmentImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import oasis.names.tc.wsrp.v1.types.StateChange;
@@ -32,12 +31,11 @@
* proxy portlet consumer.
*
**/
-public class ConsumerEnvironmentImpl extends GenericConsumerEnvironment
-{
+public class ConsumerEnvironmentImpl extends GenericConsumerEnvironment {
private static String CONSUMER_AGENT = "WSRP4J proxy portlet consumer v0.1";
- private String registryPath = null;
+ private String registryPath;
public ConsumerEnvironmentImpl()
{
1.4 +4 -5 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/URLGeneratorImpl.java
Index: URLGeneratorImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/URLGeneratorImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URLGeneratorImpl.java 20 May 2005 09:41:29 -0000 1.3
+++ URLGeneratorImpl.java 9 Aug 2005 09:10:28 -0000 1.4
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import java.io.File;
@@ -38,13 +37,13 @@
public class URLGeneratorImpl implements URLGenerator
{
- private static URLGeneratorImpl instance = null;
+ private static URLGeneratorImpl instance;
- private RenderResponse renderResponse = null;
- private Map consumerParameters = null;
+ private RenderResponse renderResponse;
+ private Map consumerParameters;
// URL to resource proxy
- private static String rpURL = null;
+ private static String rpURL;
private static String RESOURCE_PROXY = "/ResourceProxy";
1.3 +2 -3 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/URLTemplateComposerImpl.java
Index: URLTemplateComposerImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/URLTemplateComposerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLTemplateComposerImpl.java 9 Mar 2004 21:40:57 -0000 1.2
+++ URLTemplateComposerImpl.java 9 Aug 2005 09:10:28 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import org.apache.wsrp4j.consumer.URLGenerator;
@@ -29,8 +28,8 @@
public class URLTemplateComposerImpl implements URLTemplateComposer
{
- private static URLTemplateComposer instance = null;
- private URLGenerator urlGenerator = null;
+ private static URLTemplateComposer instance;
+ private URLGenerator urlGenerator;
public static URLTemplateComposer getInstance()
{
1.4 +7 -8 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/WSRPRequestImpl.java
Index: WSRPRequestImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/WSRPRequestImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSRPRequestImpl.java 27 May 2005 11:37:34 -0000 1.3
+++ WSRPRequestImpl.java 9 Aug 2005 09:10:28 -0000 1.4
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import java.util.ArrayList;
@@ -57,15 +56,15 @@
private final String nameSpace;
private final String userAuth;
- private NamedString[] formParameters = null;
- private String interactionState = null;
- private String currentMode = null;
- private String currentState = null;
- private String naviState = null;
+ private NamedString[] formParameters;
+ private String interactionState;
+ private String currentMode;
+ private String currentState;
+ private String naviState;
// just for performance reasons we cache this info
- private String[] modes = null;
- private String[] locales = null;
+ private String[] modes;
+ private String[] locales;
protected Logger logger = LogManager.getLogManager().getLogger(WSRPRequestImpl.class);
1.7 +2 -3 ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ProxyPortlet.java
Index: ProxyPortlet.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/proxyportlet/src/org/apache/wsrp4j/consumer/portlet/impl/ProxyPortlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProxyPortlet.java 27 May 2005 11:37:34 -0000 1.6
+++ ProxyPortlet.java 9 Aug 2005 09:10:28 -0000 1.7
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.consumer.portlet.impl;
import java.io.IOException;
@@ -84,10 +83,10 @@
{
// stores consumer specific information
- private ConsumerEnvironment consumerEnv = null;
+ private ConsumerEnvironment consumerEnv;
// used to validate producer responses
- private static ParameterChecker checker = null;
+ private static ParameterChecker checker;
// logger
private static final Logger logger = LogManager.getLogManager().getLogger(ProxyPortlet.class);
1.3 +2 -8 ws-wsrp4j/src/org/apache/wsrp4j/persistence/driver/PersistentAccess.java
Index: PersistentAccess.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/persistence/driver/PersistentAccess.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistentAccess.java 9 Mar 2004 21:42:19 -0000 1.2
+++ PersistentAccess.java 9 Aug 2005 09:10:29 -0000 1.3
@@ -13,12 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*
-
- */
-
-
package org.apache.wsrp4j.persistence.driver;
import java.io.InputStream;
@@ -60,10 +54,10 @@
private static Properties pFactories = null;
// holds the instance of the server factory after initializing
- private static ServerPersistentFactory serverPersistentFactory = null;
+ private static ServerPersistentFactory serverPersistentFactory;
// holds the instance of the client factory after initializing
- private static ClientPersistentFactory clientPersistentFactory = null;
+ private static ClientPersistentFactory clientPersistentFactory;
// log and trace support
private static Logger logger = LogManager.getLogManager().getLogger(getThisClass());
1.3 +0 -1 ws-wsrp4j/portlets/wsrptest/src/org/apache/wsrp4j/testportlet/TestPortlet.java
Index: TestPortlet.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/portlets/wsrptest/src/org/apache/wsrp4j/testportlet/TestPortlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestPortlet.java 9 Mar 2004 21:41:12 -0000 1.2
+++ TestPortlet.java 9 Aug 2005 09:10:29 -0000 1.3
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.wsrp4j.testportlet;
import javax.portlet.*;
1.4 +0 -1 ws-wsrp4j/src/org/apache/wsrp4j/util/StateChangedServiceImpl.java
Index: StateChangedServiceImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/util/StateChangedServiceImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StateChangedServiceImpl.java 26 Jul 2005 14:21:49 -0000 1.3
+++ StateChangedServiceImpl.java 9 Aug 2005 09:10:29 -0000 1.4
@@ -26,7 +26,6 @@
*
* @version 1.0
*/
-
public class StateChangedServiceImpl implements StateChangedService {
// internal list of StateChangedListeners