svnno****@sourc*****
svnno****@sourc*****
2007年 8月 12日 (日) 07:27:16 JST
Revision: 454
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=454
Author: shinsuke
Date: 2007-08-12 07:27:15 +0900 (Sun, 12 Aug 2007)
Log Message:
-----------
modified license term. added NPE check. code alignment.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,46 +1,40 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin;
-public class PALAdminException extends Exception
-{
+public class PALAdminException extends Exception {
/**
* serial id
*/
private static final long serialVersionUID = 0L;
- public PALAdminException()
- {
+ public PALAdminException() {
super();
}
- public PALAdminException(String message, Throwable cause)
- {
+ public PALAdminException(String message, Throwable cause) {
super(message, cause);
}
- public PALAdminException(String message)
- {
+ public PALAdminException(String message) {
super(message);
}
- public PALAdminException(Throwable cause)
- {
+ public PALAdminException(Throwable cause) {
super(cause);
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,57 +1,48 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web;
-public abstract class AbstractCrudPage
-{
+public abstract class AbstractCrudPage {
private int crudType = 0;
- public AbstractCrudPage()
- {
+ public AbstractCrudPage() {
}
- public int getCrudType()
- {
+ public int getCrudType() {
return this.crudType;
}
- public void setCrudType(int type)
- {
+ public void setCrudType(int type) {
this.crudType = type;
}
- public boolean isCreate()
- {
+ public boolean isCreate() {
return getCrudType() == CrudType.CREATE;
}
- public boolean isRead()
- {
+ public boolean isRead() {
return getCrudType() == CrudType.READ;
}
- public boolean isUpdate()
- {
+ public boolean isUpdate() {
return getCrudType() == CrudType.UPDATE;
}
- public boolean isDelete()
- {
+ public boolean isDelete() {
return getCrudType() == CrudType.DELETE;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,23 +1,22 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web;
-public abstract class AbstractPagerPage extends AbstractCrudPage implements PagerPage
-{
+public abstract class AbstractPagerPage extends AbstractCrudPage implements
+ PagerPage {
private Integer count;
@@ -29,88 +28,77 @@
private Integer nextPageNumber;
- public AbstractPagerPage()
- {
+ public AbstractPagerPage() {
super();
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#getCount()
*/
- public Integer getCount()
- {
+ public Integer getCount() {
return count;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#setCount(java.lang.Integer)
*/
- public void setCount(Integer count)
- {
+ public void setCount(Integer count) {
this.count = count;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#getCurrentPageNumber()
*/
- public Integer getCurrentPageNumber()
- {
+ public Integer getCurrentPageNumber() {
return currentPageNumber;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#setCurrentPageNumber(java.lang.Integer)
*/
- public void setCurrentPageNumber(Integer currentPageNumber)
- {
+ public void setCurrentPageNumber(Integer currentPageNumber) {
this.currentPageNumber = currentPageNumber;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#getMaxPageNumber()
*/
- public Integer getMaxPageNumber()
- {
+ public Integer getMaxPageNumber() {
return maxPageNumber;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#setMaxPageNumber(java.lang.Integer)
*/
- public void setMaxPageNumber(Integer maxPageNumber)
- {
+ public void setMaxPageNumber(Integer maxPageNumber) {
this.maxPageNumber = maxPageNumber;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#getNextPageNumber()
*/
- public Integer getNextPageNumber()
- {
+ public Integer getNextPageNumber() {
return nextPageNumber;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#setNextPageNumber(java.lang.Integer)
*/
- public void setNextPageNumber(Integer nextPageNumber)
- {
+ public void setNextPageNumber(Integer nextPageNumber) {
this.nextPageNumber = nextPageNumber;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#getPreviousPageNumber()
*/
- public Integer getPreviousPageNumber()
- {
+ public Integer getPreviousPageNumber() {
return previousPageNumber;
}
/* (non-Javadoc)
* @see jp.sf.pal.admin.web.PagerPage#setPreviousPageNumber(java.lang.Integer)
*/
- public void setPreviousPageNumber(Integer previousPageNumber)
- {
+ public void setPreviousPageNumber(Integer previousPageNumber) {
this.previousPageNumber = previousPageNumber;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,46 +1,45 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web;
public final class CrudType {
- public static final int CREATE = 0;
-
- public static final int READ = 1;
-
- public static final int UPDATE = 2;
-
- public static final int DELETE = 3;
+ public static final int CREATE = 0;
- public static String toString(int type) {
- String result = "";
- switch(type) {
- case CREATE:
- result = "CREATE";
- break;
- case UPDATE:
- result = "UPDATE";
- break;
- case DELETE:
- result = "DELETE";
- break;
- default:
- break;
- }
- return result;
- }
+ public static final int READ = 1;
+
+ public static final int UPDATE = 2;
+
+ public static final int DELETE = 3;
+
+ public static String toString(int type) {
+ String result = "";
+ switch (type) {
+ case CREATE:
+ result = "CREATE";
+ break;
+ case UPDATE:
+ result = "UPDATE";
+ break;
+ case DELETE:
+ result = "DELETE";
+ break;
+ default:
+ break;
+ }
+ return result;
+ }
}
\ No newline at end of file
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,23 +1,21 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web;
-public interface PagerPage
-{
+public interface PagerPage {
public abstract Integer getCount();
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.deployer;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.deployer;
@@ -25,8 +24,8 @@
import jp.sf.pal.admin.web.AbstractCrudPage;
import jp.sf.pal.admin.web.CrudType;
-public class RemotePortletDeployConfirmPage extends AbstractCrudPage implements Serializable
-{
+public class RemotePortletDeployConfirmPage extends AbstractCrudPage implements
+ Serializable {
/**
*
@@ -43,51 +42,42 @@
private PortletDeploymentService portletDeploymentService;
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
- public void setArtifactId(String artifactId)
- {
+ public void setArtifactId(String artifactId) {
this.artifactId = artifactId;
}
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
- public void setGroupId(String groupId)
- {
+ public void setGroupId(String groupId) {
this.groupId = groupId;
}
- public String getPackaging()
- {
+ public String getPackaging() {
return packaging;
}
- public void setPackaging(String packaging)
- {
+ public void setPackaging(String packaging) {
this.packaging = packaging;
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public void setVersion(String version)
- {
+ public void setVersion(String version) {
this.version = version;
}
/**
* @return the portletDeploymentService
*/
- public PortletDeploymentService getPortletDeploymentService()
- {
+ public PortletDeploymentService getPortletDeploymentService() {
return portletDeploymentService;
}
@@ -95,38 +85,28 @@
* @param portletDeploymentService the portletDeploymentService to set
*/
public void setPortletDeploymentService(
- PortletDeploymentService portletDeploymentService)
- {
+ PortletDeploymentService portletDeploymentService) {
this.portletDeploymentService = portletDeploymentService;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public String prerender()
- {
+ public String prerender() {
return null;
}
- public Class doFinish()
- {
+ public Class doFinish() {
if (getGroupId() == null || getArtifactId() == null
- || getVersion() == null || getPackaging() == null)
- {
+ || getVersion() == null || getPackaging() == null) {
FacesMessageUtil.addWarnMessage("invalid.portlet.parameter");
- }
- else
- {
- try
- {
+ } else {
+ try {
portletDeploymentService.deploy(this);
FacesMessageUtil
.addInfoMessage("started.portlet.application.deployment");
- }
- catch (PALAdminException e)
- {
+ } catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.start.portlet.application.deployment");
}
@@ -134,8 +114,7 @@
return RemotePortletListPage.class;
}
- public boolean isComeFromList()
- {
+ public boolean isComeFromList() {
return getCrudType() == CrudType.READ
|| getCrudType() == CrudType.DELETE;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.deployer;
@@ -25,8 +24,7 @@
import jp.sf.pal.admin.web.AbstractPagerPage;
public class RemotePortletListPage extends AbstractPagerPage implements
- Serializable
-{
+ Serializable {
/**
*
@@ -58,121 +56,100 @@
/**
* @return the publisherName
*/
- public String getPublisherName()
- {
+ public String getPublisherName() {
return publisherName;
}
/**
* @param publisherName the publisherName to set
*/
- public void setPublisherName(String publisherName)
- {
+ public void setPublisherName(String publisherName) {
this.publisherName = publisherName;
}
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
- public void setArtifactId(String artifactId)
- {
+ public void setArtifactId(String artifactId) {
this.artifactId = artifactId;
}
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
- public void setGroupId(String groupId)
- {
+ public void setGroupId(String groupId) {
this.groupId = groupId;
}
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
- public String getPackaging()
- {
+ public String getPackaging() {
return packaging;
}
- public void setPackaging(String packaging)
- {
+ public void setPackaging(String packaging) {
this.packaging = packaging;
}
- public int getPortletApplicationIndex()
- {
+ public int getPortletApplicationIndex() {
return portletApplicationIndex;
}
- public void setPortletApplicationIndex(int portletApplicationIndex)
- {
+ public void setPortletApplicationIndex(int portletApplicationIndex) {
this.portletApplicationIndex = portletApplicationIndex;
}
- public List<Map<String, Object>> getPortletApplicationItems()
- {
+ public List<Map<String, Object>> getPortletApplicationItems() {
return portletApplicationItems;
}
public void setPortletApplicationItems(
- List<Map<String, Object>> portletApplicationItems)
- {
+ List<Map<String, Object>> portletApplicationItems) {
this.portletApplicationItems = portletApplicationItems;
}
- public List<Map<String, String>> getRepositoryNameItems()
- {
+ public List<Map<String, String>> getRepositoryNameItems() {
return repositoryNameItems;
}
- public void setRepositoryNameItems(List<Map<String, String>> repositoryItems)
- {
+ public void setRepositoryNameItems(List<Map<String, String>> repositoryItems) {
this.repositoryNameItems = repositoryItems;
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public void setVersion(String version)
- {
+ public void setVersion(String version) {
this.version = version;
}
/**
* @return the repositoryName
*/
- public String getRepositoryName()
- {
+ public String getRepositoryName() {
return repositoryName;
}
/**
* @param repositoryName the repositoryName to set
*/
- public void setRepositoryName(String repositoryName)
- {
+ public void setRepositoryName(String repositoryName) {
this.repositoryName = repositoryName;
}
/**
* @return the portletDeploymentService
*/
- public PortletDeploymentService getPortletDeploymentService()
- {
+ public PortletDeploymentService getPortletDeploymentService() {
return portletDeploymentService;
}
@@ -180,32 +157,27 @@
* @param portletDeploymentService the portletDeploymentService to set
*/
public void setPortletDeploymentService(
- PortletDeploymentService portletDeploymentService)
- {
+ PortletDeploymentService portletDeploymentService) {
this.portletDeploymentService = portletDeploymentService;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public String prerender()
- {
+ public String prerender() {
getPortletDeploymentService().loadPage(this);
return null;
}
- public String doSelectRepository()
- {
+ public String doSelectRepository() {
getPortletDeploymentService().updatePager(this);
return null;
}
- public boolean isDeploying()
- {
+ public boolean isDeploying() {
return DeploymentUtil.isDeploying();
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.deployer;
@@ -26,8 +25,7 @@
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
-public class RemoteRepositoryConfirmPage extends AbstractCrudPage
-{
+public class RemoteRepositoryConfirmPage extends AbstractCrudPage {
private String name;
@@ -35,37 +33,32 @@
private RepositoryManagementService repositoryManagementService;
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
/**
* @return the configPath
*/
- public String getConfigPath()
- {
+ public String getConfigPath() {
return configPath;
}
/**
* @param configPath the configPath to set
*/
- public void setConfigPath(String configPath)
- {
+ public void setConfigPath(String configPath) {
this.configPath = configPath;
}
/**
* @return the repositoryManagementService
*/
- public RepositoryManagementService getRepositoryManagementService()
- {
+ public RepositoryManagementService getRepositoryManagementService() {
return repositoryManagementService;
}
@@ -73,76 +66,58 @@
* @param repositoryManagementService the repositoryManagementService to set
*/
public void setRepositoryManagementService(
- RepositoryManagementService repositoryManagementService)
- {
+ RepositoryManagementService repositoryManagementService) {
this.repositoryManagementService = repositoryManagementService;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public Class prerender()
- {
+ public Class prerender() {
return null;
}
@TakeOver(type = TakeOverType.NEVER)
- public Class doFinish()
- {
- if (getName() == null)
- {
+ public Class doFinish() {
+ if (getName() == null) {
FacesMessageUtil.addWarnMessage("invalid.repository.parameters");
return RemoteRepositoryListPage.class;
}
- switch (getCrudType())
- {
- case CrudType.CREATE:
- try
- {
- getRepositoryManagementService().create(this);
- FacesMessageUtil.addInfoMessage("added.new.repository");
- }
- catch (PALAdminException e)
- {
- FacesMessageUtil
- .addErrorMessage("failed.to.add.new.repository");
- }
- break;
- case CrudType.UPDATE:
- try
- {
- getRepositoryManagementService().update(this);
- FacesMessageUtil.addInfoMessage("updated.repository");
- }
- catch (PALAdminException e)
- {
- FacesMessageUtil
- .addErrorMessage("failed.to.update.repository");
- }
- break;
- case CrudType.DELETE:
- try
- {
- getRepositoryManagementService().delete(this);
- FacesMessageUtil.addInfoMessage("deleted.repository");
- }
- catch (PALAdminException e)
- {
- FacesMessageUtil
- .addErrorMessage("failed.to.delete.repository");
- }
- break;
- default:
- break;
+ switch (getCrudType()) {
+ case CrudType.CREATE:
+ try {
+ getRepositoryManagementService().create(this);
+ FacesMessageUtil.addInfoMessage("added.new.repository");
+ } catch (PALAdminException e) {
+ FacesMessageUtil
+ .addErrorMessage("failed.to.add.new.repository");
+ }
+ break;
+ case CrudType.UPDATE:
+ try {
+ getRepositoryManagementService().update(this);
+ FacesMessageUtil.addInfoMessage("updated.repository");
+ } catch (PALAdminException e) {
+ FacesMessageUtil.addErrorMessage("failed.to.update.repository");
+ }
+ break;
+ case CrudType.DELETE:
+ try {
+ getRepositoryManagementService().delete(this);
+ FacesMessageUtil.addInfoMessage("deleted.repository");
+ } catch (PALAdminException e) {
+ FacesMessageUtil.addErrorMessage("failed.to.delete.repository");
+ }
+ break;
+ default:
+ break;
}
return RemoteRepositoryListPage.class;
}
- public boolean isComeFromList()
- {
+ public boolean isComeFromList() {
return getCrudType() == CrudType.READ
|| getCrudType() == CrudType.DELETE;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.deployer;
@@ -24,8 +23,7 @@
import jp.sf.pal.admin.web.AbstractCrudPage;
public class RemoteRepositoryEditPage extends AbstractCrudPage implements
- Serializable
-{
+ Serializable {
/**
*
@@ -38,37 +36,32 @@
private RepositoryManagementService repositoryManagementService;
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
/**
* @return the configPath
*/
- public String getConfigPath()
- {
+ public String getConfigPath() {
return configPath;
}
/**
* @param configPath the configPath to set
*/
- public void setConfigPath(String configPath)
- {
+ public void setConfigPath(String configPath) {
this.configPath = configPath;
}
/**
* @return the repositoryManagementService
*/
- public RepositoryManagementService getRepositoryManagementService()
- {
+ public RepositoryManagementService getRepositoryManagementService() {
return repositoryManagementService;
}
@@ -76,22 +69,17 @@
* @param repositoryManagementService the repositoryManagementService to set
*/
public void setRepositoryManagementService(
- RepositoryManagementService repositoryManagementService)
- {
+ RepositoryManagementService repositoryManagementService) {
this.repositoryManagementService = repositoryManagementService;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public Class prerender()
- {
- if (isUpdate())
- {
- if (getName() == null)
- {
+ public Class prerender() {
+ if (isUpdate()) {
+ if (getName() == null) {
FacesMessageUtil
.addErrorMessage("invalid.repository.parameters");
return RemoteRepositoryListPage.class;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryListPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryListPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.deployer;
@@ -22,8 +21,7 @@
import jp.sf.pal.admin.service.RepositoryManagementService;
import jp.sf.pal.admin.web.AbstractPagerPage;
-public class RemoteRepositoryListPage extends AbstractPagerPage
-{
+public class RemoteRepositoryListPage extends AbstractPagerPage {
private boolean available;
@@ -38,55 +36,46 @@
/**
* @return the available
*/
- public boolean isAvailable()
- {
+ public boolean isAvailable() {
return available;
}
/**
* @param available the available to set
*/
- public void setAvailable(boolean available)
- {
+ public void setAvailable(boolean available) {
this.available = available;
}
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
- public int getRepositoryIndex()
- {
+ public int getRepositoryIndex() {
return repositoryIndex;
}
- public void setRepositoryIndex(int portletApplicationIndex)
- {
+ public void setRepositoryIndex(int portletApplicationIndex) {
this.repositoryIndex = portletApplicationIndex;
}
- public List<Map<String, Object>> getRepositoryItems()
- {
+ public List<Map<String, Object>> getRepositoryItems() {
return repositoryItems;
}
public void setRepositoryItems(
- List<Map<String, Object>> portletApplicationItems)
- {
+ List<Map<String, Object>> portletApplicationItems) {
this.repositoryItems = portletApplicationItems;
}
/**
* @return the portletManagementService
*/
- public RepositoryManagementService getRepositoryManagementService()
- {
+ public RepositoryManagementService getRepositoryManagementService() {
return portletManagementService;
}
@@ -94,20 +83,17 @@
* @param portletManagementService the portletManagementService to set
*/
public void setRepositoryManagementService(
- RepositoryManagementService portletManagementService)
- {
+ RepositoryManagementService portletManagementService) {
this.portletManagementService = portletManagementService;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public String prerender()
- {
+ public String prerender() {
getRepositoryManagementService().loadPage(this);
-
+
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.group;
@@ -21,34 +20,29 @@
import org.seasar.teeda.extension.annotation.validator.Required;
-public class AbstractGroupPage extends AbstractCrudPage
-{
+public class AbstractGroupPage extends AbstractCrudPage {
private String name;
private GroupManagementService groupManagementService;
- public AbstractGroupPage()
- {
+ public AbstractGroupPage() {
super();
}
- public String getName()
- {
+ public String getName() {
return name;
}
@Required
- public void setName(String groupName)
- {
+ public void setName(String groupName) {
this.name = groupName;
}
/**
* @return the groupManagementService
*/
- public GroupManagementService getGroupManagementService()
- {
+ public GroupManagementService getGroupManagementService() {
return groupManagementService;
}
@@ -56,8 +50,7 @@
* @param groupManagementService the groupManagementService to set
*/
public void setGroupManagementService(
- GroupManagementService groupManagementService)
- {
+ GroupManagementService groupManagementService) {
this.groupManagementService = groupManagementService;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.portletmanager;
@@ -26,8 +25,7 @@
import jp.sf.pal.admin.web.AbstractCrudPage;
public class PortletActionConfirmPage extends AbstractCrudPage implements
- Serializable
-{
+ Serializable {
/**
*
@@ -40,37 +38,32 @@
private PortletManagementService portletManagementService;
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
/**
* @return the action
*/
- public String getAction()
- {
+ public String getAction() {
return action;
}
/**
* @param action the action to set
*/
- public void setAction(String action)
- {
+ public void setAction(String action) {
this.action = action;
}
/**
* @return the portletManagementService
*/
- public PortletManagementService getPortletManagementService()
- {
+ public PortletManagementService getPortletManagementService() {
return portletManagementService;
}
@@ -78,104 +71,75 @@
* @param portletManagementService the portletManagementService to set
*/
public void setPortletManagementService(
- PortletManagementService portletManagementService)
- {
+ PortletManagementService portletManagementService) {
this.portletManagementService = portletManagementService;
}
- public String initialize()
- {
+ public String initialize() {
return null;
}
- public String prerender()
- {
+ public String prerender() {
return null;
}
- public Class doFinish()
- {
- if (isStartAction())
- {
- try
- {
+ public Class doFinish() {
+ if (isStartAction()) {
+ try {
portletManagementService.startPortletApplication(this);
FacesMessageUtil.addInfoMessage("started.portlet.application");
- }
- catch (PALAdminException e)
- {
+ } catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.start.portlet.application");
}
- }
- else if (isStopAction())
- {
- try
- {
+ } else if (isStopAction()) {
+ try {
portletManagementService.stopPortletApplication(this);
FacesMessageUtil.addInfoMessage("stopped.portlet.application");
- }
- catch (PALAdminException e)
- {
+ } catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.stop.portlet.application");
}
- }
- else if (isUndeployAction())
- {
- try
- {
+ } else if (isUndeployAction()) {
+ try {
portletManagementService.undeployPortletApplication(this);
FacesMessageUtil
.addInfoMessage("undeployed.portlet.application");
- }
- catch (PALAdminException e)
- {
+ } catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.undeploy.portlet.application");
}
- }
- else if (isDeleteAction())
- {
- try
- {
+ } else if (isDeleteAction()) {
+ try {
portletManagementService.deletePortletApplication(this);
FacesMessageUtil.addInfoMessage("deleted.portlet.application");
- }
- catch (PALAdminException e)
- {
+ } catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.delete.portlet.application");
}
- }
- else
- {
+ } else {
FacesMessageUtil
.addWarnMessage("invalid.action.for.portlet.application");
}
return PortletListPage.class;
}
- public boolean isStartAction()
- {
+ public boolean isStartAction() {
return PALAdminConstants.PORTLET_MANAGEMENT_ACTION_START
.equals(getAction());
}
- public boolean isStopAction()
- {
+ public boolean isStopAction() {
return PALAdminConstants.PORTLET_MANAGEMENT_ACTION_STOP
.equals(getAction());
}
- public boolean isUndeployAction()
- {
+ public boolean isUndeployAction() {
return PALAdminConstants.PORTLET_MANAGEMENT_ACTION_UNDEPLOY
.equals(getAction());
}
- public boolean isDeleteAction()
- {
+ public boolean isDeleteAction() {
return PALAdminConstants.PORTLET_MANAGEMENT_ACTION_DELETE
.equals(getAction());
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.portletmanager;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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 jp.sf.pal.admin.web.registration;
import java.io.Serializable;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ResetPasswordPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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 jp.sf.pal.admin.web.registration;
import java.io.IOException;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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 jp.sf.pal.admin.web.registration;
import java.io.Serializable;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.role;
@@ -21,34 +20,29 @@
import org.seasar.teeda.extension.annotation.validator.Required;
-public class AbstractRolePage extends AbstractCrudPage
-{
+public class AbstractRolePage extends AbstractCrudPage {
private String name;
private RoleManagementService roleManagementService;
- public AbstractRolePage()
- {
+ public AbstractRolePage() {
super();
}
- public String getName()
- {
+ public String getName() {
return name;
}
@Required
- public void setName(String roleName)
- {
+ public void setName(String roleName) {
this.name = roleName;
}
/**
* @return the roleManagementService
*/
- public RoleManagementService getRoleManagementService()
- {
+ public RoleManagementService getRoleManagementService() {
return roleManagementService;
}
@@ -56,8 +50,7 @@
* @param roleManagementService the roleManagementService to set
*/
public void setRoleManagementService(
- RoleManagementService roleManagementService)
- {
+ RoleManagementService roleManagementService) {
this.roleManagementService = roleManagementService;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -23,7 +23,6 @@
import jp.sf.pal.admin.entity.NodeInfo;
import jp.sf.pal.admin.service.SiteEditorService;
-import org.apache.poi.hssf.record.formula.functions.Setvalue;
import org.seasar.teeda.extension.util.LabelHelper;
public abstract class AbstractSiteEditorPage {
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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 jp.sf.pal.admin.web.site;
import java.io.Serializable;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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 jp.sf.pal.admin.web.user;
import jp.sf.pal.admin.service.UserManagementService;
@@ -3,8 +18,8 @@
import jp.sf.pal.admin.web.AbstractCrudPage;
-public class AbstractUserAttributePage extends AbstractCrudPage
-{
+public class AbstractUserAttributePage extends AbstractCrudPage {
private String name;
+
private String key;
@@ -13,55 +28,48 @@
private UserManagementService userManagementService;
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
/**
* @return the key
*/
- public String getKey()
- {
+ public String getKey() {
return key;
}
/**
* @param key the key to set
*/
- public void setKey(String key)
- {
+ public void setKey(String key) {
this.key = key;
}
- public String getValue()
- {
+ public String getValue() {
return value;
}
- public void setValue(String value)
- {
+ public void setValue(String value) {
this.value = value;
}
/**
* @return the userManagementService
*/
- public UserManagementService getUserManagementService()
- {
+ public UserManagementService getUserManagementService() {
return userManagementService;
}
/**
* @param userManagementService the userManagementService to set
*/
- public void setUserManagementService(UserManagementService userManagementService)
- {
+ public void setUserManagementService(
+ UserManagementService userManagementService) {
this.userManagementService = userManagementService;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -1,18 +1,17 @@
/*
- * 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
- *
+ * Copyright 2005-2007 Portal Application Laboratory and the Others.
+ *
+ * Licensed 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.
+ * 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 jp.sf.pal.admin.web.user;
@@ -21,8 +20,7 @@
import org.seasar.teeda.extension.annotation.validator.Required;
-public class AbstractUserPage extends AbstractCrudPage
-{
+public class AbstractUserPage extends AbstractCrudPage {
private String name;
@@ -34,27 +32,23 @@
private UserManagementService userManagementService;
- public AbstractUserPage()
- {
+ public AbstractUserPage() {
super();
}
- public String getName()
- {
+ public String getName() {
return name;
}
@Required
- public void setName(String userName)
- {
+ public void setName(String userName) {
this.name = userName;
}
/**
* @return the password
*/
- public String getPassword()
- {
+ public String getPassword() {
return password;
}
@@ -62,16 +56,14 @@
* @param password the password to set
*/
@Required
- public void setPassword(String password)
- {
+ public void setPassword(String password) {
this.password = password;
}
/**
* @return the role
*/
- public String getRoleName()
- {
+ public String getRoleName() {
return roleName;
}
@@ -79,32 +71,28 @@
* @param role the role to set
*/
@Required
- public void setRoleName(String role)
- {
+ public void setRoleName(String role) {
this.roleName = role;
}
/**
* @return the updateRequired
*/
- public boolean isUpdateRequired()
- {
+ public boolean isUpdateRequired() {
return updateRequired;
}
/**
* @param updateRequired the updateRequired to set
*/
- public void setUpdateRequired(boolean updateRequired)
- {
+ public void setUpdateRequired(boolean updateRequired) {
this.updateRequired = updateRequired;
}
/**
* @return the userManagementService
*/
- public UserManagementService getUserManagementService()
- {
+ public UserManagementService getUserManagementService() {
return userManagementService;
}
@@ -112,8 +100,7 @@
* @param userManagementService the userManagementService to set
*/
public void setUserManagementService(
- UserManagementService userManagementService)
- {
+ UserManagementService userManagementService) {
this.userManagementService = userManagementService;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -206,6 +206,9 @@
}
public boolean isGroupsForUser() {
- return getGroupsItems().size() > 0;
+ if (getGroupsItems() != null) {
+ return getGroupsItems().size() > 0;
+ }
+ return false;
}
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2007-08-11 07:32:24 UTC (rev 453)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2007-08-11 22:27:15 UTC (rev 454)
@@ -197,7 +197,10 @@
}
public boolean isRolesForUser() {
- return getRolesItems().size() > 0;
+ if (getRolesItems() != null) {
+ return getRolesItems().size() > 0;
+ }
+ return false;
}
}