Thread: [Comsuite-svn] SF.net SVN: comsuite: [202] trunk/code (Page 2)
Brought to you by:
zduniak
Menu
▾
▴
comsuite-svn
|
From: <sku...@us...> - 2006-10-05 13:34:53
|
Revision: 202
http://svn.sourceforge.net/comsuite/?rev=202&view=rev
Author: skuzniak
Date: 2006-10-05 06:34:14 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
confirmation of deleting items provided.removing assigned roles from groups bug fixed.
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java
trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp
trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp
trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/GroupBean.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -169,7 +169,7 @@
ids[i] = item.getValue().toString();
i++;
}
- ws.updateRolesForGroup(group, ids);
+ ws.updateRolesForGroup(group, ids, new String[0]);
LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_GROUP_SUCCESSFULL,
BeansUtils.ADD_GROUP_NAVIGATION);
} catch (WebServiceException wse) {
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/groups/SearchGroupBean.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -64,6 +64,8 @@
private List<RoleExtended> temporaryRolesForGroup;
+ private List<RoleExtended> temporaryRolesForDelete;
+
private List<UserExtended> temporaryUsersForGroup;
private List<UserExtended> temporaryUsersForDelete;
@@ -532,14 +534,24 @@
i++;
}
final WSGroup group2 = ws.updateUsersForGroup(group, idsToAdd, idsToDelete);
-
+ logger.debug("adding");
int i2 = 0;
- final String[] ids2 = new String[this.temporaryRolesForGroup.size()];
+ final String[] idsToAdd2 = new String[this.temporaryRolesForGroup.size()];
for (final RoleExtended role : this.temporaryRolesForGroup) {
- ids2[i2] = String.valueOf(role.getRole().getId());
+ logger.debug("add "+ i2);
+ idsToAdd2[i2] = String.valueOf(role.getRole().getId());
i2++;
}
- ws.updateRolesForGroup(group2, ids2);
+ logger.debug("deleting");
+ i2 = 0;
+ final String[] idsToDelete2 = new String[this.temporaryRolesForDelete.size()];
+ for (final RoleExtended role : this.temporaryRolesForDelete) {
+ logger.debug("delete "+ i2);
+ idsToDelete2[i2] = String.valueOf(role.getRole().getId());
+ i2++;
+ }
+ logger.debug("updating");
+ ws.updateRolesForGroup(group2, idsToAdd2, idsToDelete2);
LanguageSelectionBean.showMessage(BeansUtils.MESSAGE_GROUP_SUCCESSFULL_UPDATE,
BeansUtils.SEARCH_GROUP_NAVIGATION);
} catch (WebServiceException wse) {
@@ -628,9 +640,14 @@
}
public String deleteSelectedRoles() {
+ if (null == this.temporaryRolesForDelete) {
+ this.temporaryRolesForDelete = new FastTable<RoleExtended>();
+ }
+
List<RoleExtended> roles = new FastTable<RoleExtended>();
for (RoleExtended r : this.temporaryRolesForGroup) {
if (r.isSelected()) {
+ this.temporaryRolesForDelete.add(r);
roles.add(r);
}
}
@@ -664,6 +681,7 @@
super();
// this.temporaryRolesForGroup = new FastTable<RoleExtended>();
this.temporaryUsersForDelete = new FastTable<UserExtended>();
+ this.temporaryRolesForDelete = new FastTable<RoleExtended>();
// this.temporaryUsersForGroup = new FastTable<UserExtended>();
}
Modified: trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/actions/CSActionSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -50,7 +50,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command" />
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchActionBean.deleteAction}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchActionBean.deleteAction}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/groups/CSGroupSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -52,7 +52,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command" />
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchGroupBean.deleteGroup}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchGroupBean.deleteGroup}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/messages/CSMessages.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -66,7 +66,8 @@
<h:outputText value="#{Locale.LABEL_DETAILS}" styleClass="listView-header-value"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink actionListener="#{searchMessageBean.selectMessage}" action="#{searchMessageBean.deleteMesage}">
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{searchMessageBean.selectMessage}" action="#{searchMessageBean.deleteMesage}">
<f:param value="#{mes.id}" name="messageId" />
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/roles/CSRoleSearch.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -50,7 +50,8 @@
<h:outputText value="#{Locale.LABEL_ADD}" styleClass="header-command"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink action="#{searchRoleBean.deleteRole}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ action="#{searchRoleBean.deleteRole}" >
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon" />
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/servers/CSSAPServers.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -58,7 +58,8 @@
<h:outputText value="#{Locale.LABEL_EDIT}" styleClass="header-command"/>
</h:panelGrid>
</h:commandLink>
- <h:commandLink actionListener="#{searchServerBean.selectServer}" action="#{searchServerBean.deleteServer}" >
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{searchServerBean.selectServer}" action="#{searchServerBean.deleteServer}" >
<f:param name="serverId" value="#{inst.instance.id}" />
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/list-remove.gif" styleClass="header-icon"/>
Modified: trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSAdminPanel/WebContent/pages/users/CSUsersSearchResult.jsp 2006-10-05 13:34:14 UTC (rev 202)
@@ -47,7 +47,8 @@
</h:panelGrid>
<f:param value="#{usr.id}" name="userId"/>
</h:commandLink>
- <h:commandLink actionListener="#{deleteUserBean.selectUser}" action="#{deleteUserBean.deleteUser}">
+ <h:commandLink onclick="if (!confirm('Are you sure you want to delete this record?')) return false"
+ actionListener="#{deleteUserBean.selectUser}" action="#{deleteUserBean.deleteUser}">
<h:panelGrid columns="1">
<h:graphicImage value="#{pageContext.request.contextPath}/pages/files/gif/user-trash.gif" styleClass="header-icon"/>
<h:outputText value="#{Locale.LABEL_DELETE}" styleClass="header-command" />
Modified: trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSCommon/src/org/commsuite/ws/ICommunicateWS.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -532,11 +532,12 @@
* updates roles assigned to <code>group</code>.
*
* @param wsGroup group to be updated
- * @param ids array of role ids
+ * @param idsToAdd array of role ids to add
+ * @param idsToDelete array of role ids to delete
* @return updated grouop object
* @throws WebServiceException on any error
*/
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException;
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException;
/**
* updates users assigned to <code>group</code>.
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -710,10 +710,10 @@
*
* @see org.commsuite.ws.IcommunicateWS#updateRolesForGroup();
*/
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException {
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException {
try {
GroupsService service = GroupsService.getInstance();
- return service.updateRolesForGroup(wsGroup, ids);
+ return service.updateRolesForGroup(wsGroup, idsToAdd, idsToDelete);
} catch (DataIntegrityViolationException dive) {
logger.fatal("Duplicate name error");
throw new WebServiceException(CommunicateUtils.DUPLICATED_GROUP_MESSAGE);
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java 2006-10-05 12:33:48 UTC (rev 201)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/services/GroupsService.java 2006-10-05 13:34:14 UTC (rev 202)
@@ -105,7 +105,7 @@
}
}
- public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] ids) throws WebServiceException {
+ public WSGroup updateRolesForGroup(WSGroup wsGroup, String[] idsToAdd, String[] idsToDelete) throws WebServiceException {
Group group;
try {
GroupManager groupManager = (GroupManager) SpringMiddlewareContext.getGroupManager();
@@ -114,8 +114,8 @@
} else {
group = groupManager.getGroup(wsGroup.getId().toString());
}
- logger.debug("IDS: " + ids);
- group.getRoles().addAll(this.getRolesToGroup(ids));
+ logger.debug("IDS: " + idsToAdd);
+ this.saveGroupToRoles(group, idsToAdd, idsToDelete);
if (validateGroup(group)) {
return groupManager.saveGroup(group);
@@ -126,7 +126,7 @@
logger.fatal("Duplicate name error");
throw new DataIntegrityViolationException(CommunicateUtils.DUPLICATED_GROUP_MESSAGE);
} catch (Throwable t) {
- logger.fatal("Fatal exception[updateActionsForRole]", t);
+ logger.fatal("Fatal exception[updateRolesForGroup]", t);
throw new WebServiceException(t);
}
}
@@ -154,7 +154,7 @@
// TODO: [SK] w implementacji tej metody nie widze operacji na grupach wiec skad taka nazwa ?
// [SK]poniewaz ta metoda sluzy do pobrania rol, aby je do grupy przypisac
- private Set<Role> getRolesToGroup(String[] ids) {
+ /*private Set<Role> getRolesToGroup(String[] ids) {
RoleManager roleManager = (RoleManager) SpringMiddlewareContext.getRoleManager();
Set<Role> roles = new FastSet<Role>();
for (String id : ids) {
@@ -163,17 +163,19 @@
roles.add(role);
}
return roles;
- }
+ }*/
private void saveGroupToUsers(Group group, String[] idsToAdd, String[] idsToDelete) {
UserManager userManager = (UserManager) SpringMiddlewareContext.getUserManager();
for (String id : idsToAdd) {
+ logger.debug("Id to add: "+ id);
User user = userManager.getUser(id);
user.getGroups().add(group);
group.getUsers().add(user);
userManager.saveUser(user);
}
for (String id : idsToDelete) {
+ logger.debug("Id to delete: "+ id);
User user = userManager.getUser(id);
user.getGroups().remove(group);
group.getUsers().remove(user);
@@ -181,6 +183,24 @@
}
}
+ private void saveGroupToRoles(Group group, String[] idsToAdd, String[] idsToDelete) {
+ RoleManager roleManager = (RoleManager) SpringMiddlewareContext.getRoleManager();
+ for (String id : idsToAdd) {
+ logger.debug("Id to add: "+ id);
+ Role role = roleManager.getRole(id);
+ role.getGroups().add(group);
+ group.getRoles().add(role);
+ roleManager.saveRole(role);
+ }
+ for (String id : idsToDelete) {
+ logger.debug("Id to delete: "+ id);
+ Role role = roleManager.getRole(id);
+ role.getGroups().remove(group);
+ group.getRoles().remove(role);
+ roleManager.saveRole(role);
+ }
+ }
+
public void deleteGroupFromDatabase(String id) throws WebServiceException {
try {
GroupManager groupManager = (GroupManager) SpringMiddlewareContext.getGroupManager();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zd...@us...> - 2006-10-13 17:20:02
|
Revision: 209
http://svn.sourceforge.net/comsuite/?rev=209&view=rev
Author: zduniak
Date: 2006-10-13 10:19:52 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
Fake SAP-servers installations configurations disabled
Modified Paths:
--------------
trunk/code/CSMiddleware/import.sql
trunk/code/CSTests/import.sql
Modified: trunk/code/CSMiddleware/import.sql
===================================================================
--- trunk/code/CSMiddleware/import.sql 2006-10-06 18:03:51 UTC (rev 208)
+++ trunk/code/CSMiddleware/import.sql 2006-10-13 17:19:52 UTC (rev 209)
@@ -1,6 +1,7 @@
---DO NOT ADD ROWS WITH ID GREATER THEN 99
-INSERT INTO cs_sap_servers (id, active_instance, adm_email, client, gw_host, gw_Serv, host, load_balancing, name, user_password, prog_id, system_number, unicode, user_name, default_instance, max_connections_in_pool, group_name, r3_name) VALUES (123456, 'true', 'zc...@bc...','100', 'bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE, 'BCC_BCZ_100_DB','nowehaslo','ZTESTJCO', '44', FALSE, 'zcomm', TRUE,5,'','');
+-- DO NOT ADD ROWS WITH ID GREATER THEN 99
+-- INSERT INTO cs_sap_servers (id, active_instance, adm_email, client, gw_host, gw_Serv, host, load_balancing, name, user_password, prog_id, system_number, unicode, user_name, default_instance, max_connections_in_pool, group_name, r3_name) VALUES (123456, 'true', 'zc...@bc...','100', 'bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE, 'BCC_BCZ_100_DB','nowehaslo','ZTESTJCO', '44', FALSE, 'zcomm', TRUE,5,'','');
+
INSERT INTO cs_actions (id, name, description) VALUES (1, 'Action_JMX_UseJmx', 'Using JMX');
INSERT INTO cs_actions (id, name, description) VALUES (2, 'Action_RemoteClient_UseRemoteClient', 'Using RemoteClient');
INSERT INTO cs_actions (id, name, description) VALUES (3, 'CSSAPServers', 'Listing all servers & testing server');
Modified: trunk/code/CSTests/import.sql
===================================================================
--- trunk/code/CSTests/import.sql 2006-10-06 18:03:51 UTC (rev 208)
+++ trunk/code/CSTests/import.sql 2006-10-13 17:19:52 UTC (rev 209)
@@ -1 +1 @@
-insert into SAP_SERVERS (id,adm_email,client,gw_host,gw_Serv,host,load_balancing,name,user_password,prog_id,system_number,unicode,user_name,default_instance,max_connections_in_pool) values(123456,'mar...@bc...','100','bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE,'BCC_BCZ_100_DB','changeme','ZTESTJCO','44',FALSE,'cstest',TRUE,5);
+-- insert into SAP_SERVERS (id,adm_email,client,gw_host,gw_Serv,host,load_balancing,name,user_password,prog_id,system_number,unicode,user_name,default_instance,max_connections_in_pool) values(123456,'mar...@bc...','100','bcz.bcc.com.pl','sapgw44','bcz.bcc.com.pl',FALSE,'BCC_BCZ_100_DB','changeme','ZTESTJCO','44',FALSE,'cstest',TRUE,5);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mal...@us...> - 2006-11-16 22:00:59
|
Revision: 218
http://svn.sourceforge.net/comsuite/?rev=218&view=rev
Author: malinowskirafal
Date: 2006-11-16 14:00:24 -0800 (Thu, 16 Nov 2006)
Log Message:
-----------
javaDoc updates
Modified Paths:
--------------
trunk/code/CSCommon/src/org/commsuite/enums/State.java
trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java
trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java
trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java
trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java
trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java
trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java
trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java
trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java
trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java
trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java
trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java
trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java
trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java
trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java
trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java
Modified: trunk/code/CSCommon/src/org/commsuite/enums/State.java
===================================================================
--- trunk/code/CSCommon/src/org/commsuite/enums/State.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSCommon/src/org/commsuite/enums/State.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -27,6 +27,13 @@
* If any of sentContent's status is FAILED then whole message is in FAILED state and notification
* to SAP server is sent.
*
+ * <ul>
+ * <li><code>NOT_SENT</code> sentContent is waiting in one of system queue to send</li>
+ * <li><code>SENT</code> sentContent was sent by device class to external device (mobile) or external program (HylaFAX)</li>
+ * <li><code>DELIVERED</code> sentContent was delivered to receiver</li>
+ * <li><code>FAILED</code> external device/program failed to deliver sentContent to receiver</li>
+ * </ul>
+ *
* @since 1.0
* @author Rafał Malinowski
*/
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/Conversion.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -43,6 +43,8 @@
}
/**
+ * Returns mime type of input data of conversion.
+ *
* @return mime type of input data of conversion
*/
public String getInMimeType() {
@@ -50,6 +52,8 @@
}
/**
+ * Returns mime type of output data of conversion.
+ *
* @return mime type of output data of conversion
*/
public String getOutMimeType() {
@@ -57,12 +61,20 @@
}
/**
+ * Returns true if no conversion is needed - in mime type is equal to out mime type.
+ *
* @return true if no conversion is needed - in mime type is equal to out mime type
*/
public boolean isIdentity() {
return inMimeType.equals(outMimeType);
}
+ /**
+ * Returns true if this object is equal to passed object (if inMimeType and outMimeType are equal).
+ *
+ * @param to object to compare with
+ * @return true if this object is equal to passed object
+ */
public boolean equals(Object to) {
if (null == to) {
return false;
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/ImageToImageConverterDescriptor.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -78,6 +78,7 @@
/**
* Creates ImageToImageConverter that converts image to image in outType (set in constructor).
+ *
* @return ImageToImageConverter that converts image to image in outType (set in constructor).
*/
public SimpleConverter createSimpleConverter() {
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverter.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -62,6 +62,8 @@
}
/**
+ * Returns stream of input data for conversion.
+ *
* @return stream of input data for conversion
*/
protected InputStream getContentStream() {
@@ -69,6 +71,8 @@
}
/**
+ * Returns stream of output data of conversion.
+ *
* @return stream of output data of conversion
*/
protected OutputStream getResultStream() {
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/SimpleConverterDescriptor.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -78,6 +78,7 @@
/**
* Returns list of mime types that described converter can convert from.
+ *
* @return list of mime types that described converter can convert from
*/
public List<String> getInMimeTypes() {
@@ -86,6 +87,7 @@
/**
* Returns true if described converter can convert from inMimeType.
+ *
* @param inMimeType checked mime type.
* @return true if described converter can convert from inMimeType
*/
@@ -95,6 +97,7 @@
/**
* Returns mime type that described converter can convert to.
+ *
* @return mime type that described converter can convert to
*/
public String getOutMimeType() {
@@ -103,6 +106,7 @@
/**
* Sets new quality for conversion.
+ *
* @param quality new quality for conversion
*/
public void setQuality(double quality) {
@@ -111,6 +115,7 @@
/**
* Returns quality of conversion.
+ *
* @return quality of conversion
*/
public double getQuality() {
@@ -119,6 +124,7 @@
/**
* Creates real converter object.
+ *
* @return real converter object
*/
public abstract SimpleConverter createSimpleConverter();
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/TiffToPdfConverter.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -163,7 +163,8 @@
/**
* Creates PDFInfo from Tiff tags - readed at readTags.
- * @return pdf info
+ *
+ * @return pdf info in form od PDFInfo object
*/
private PDFInfo createPDFInfoFromTags() {
PDFInfo pdfinfo = new PDFInfo();
Modified: trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/converter/utils/openoffice/XByteArrayInputStream.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -54,6 +54,8 @@
* Moves internal pointer to p1 position.
*
* @param p1 new internal pointer position.
+ * @throws IllegalArgumentException when p1 is too small or too big
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public void seek(long p1) throws IllegalArgumentException,
com.sun.star.io.IOException {
@@ -64,6 +66,7 @@
* Returns internal pointer position.
*
* @return internal pointer position
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public long getPosition() throws com.sun.star.io.IOException {
return pos;
@@ -73,6 +76,7 @@
* Returns length of data array.
*
* @returns length of data array
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public long getLength() throws com.sun.star.io.IOException {
return count;
@@ -84,6 +88,9 @@
* @param p1 output data array
* @param p2 max length of data read
* @return count of bytes actually read
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws BufferSizeExceededException when buffer size was exceeded in output stream
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public int readBytes(byte[][] p1, int p2) throws NotConnectedException,
BufferSizeExceededException, com.sun.star.io.IOException {
@@ -113,6 +120,9 @@
* @param p1 output data array
* @param p2 max length of data read
* @return count of bytes actually read
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws BufferSizeExceededException when buffer size was exceeded in output stream
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public int readSomeBytes(byte[][] p1, int p2) throws NotConnectedException,
BufferSizeExceededException, com.sun.star.io.IOException {
@@ -121,16 +131,32 @@
/**
* Skips some bytes from data array.
+ *
+ * @param p1 number of bytes to skip
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws BufferSizeExceededException when buffer size was exceeded in output stream
+ * @throws com.sun.star.io.IOException when IOException occurs
*/
public void skipBytes(int p1) throws NotConnectedException,
BufferSizeExceededException, com.sun.star.io.IOException {
skip(p1);
}
+ /**
+ * Returns how many available bytes are ready to read in stream.
+ *
+ * @return how many available bytes are ready to read in stream
+ */
public int available() {
return super.available();
}
+ /**
+ * Closes input stream.
+ *
+ * @throws NotConnectedException when application is not connected to OOo server
+ * @throws com.sun.star.io.IOException when IOException occurs
+ */
public void closeInput() throws NotConnectedException,
com.sun.star.io.IOException {
try {
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/Device.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -160,7 +160,7 @@
}
/**
- * Sends simpel message to receiver. Saves send status into database.
+ * Sends simple message to receiver. Saves send status into database.
*
* @param sentContent sentContent to send
* @param receiver destination address
@@ -247,6 +247,8 @@
/**
* Adds new listener of receiving messages.
+ *
+ * @param receiveListener new receive listener
*/
public void addReceiveListener(ReceiveListener receiveListener) {
synchronized (receiveListeners) {
@@ -256,6 +258,8 @@
/**
* Removes listener of receiving messages.
+ *
+ * @param receiveListener receive listener to remove
*/
public void removeReceiveListener(ReceiveListener receiveListener) {
synchronized (receiveListeners) {
@@ -265,6 +269,8 @@
/**
* Adds new listener of chaning outbound message state.
+ *
+ * @param sendStateChangeListener new sent state change listener
*/
public void addSendStateChangeListener(SendStateChangeListener sendStateChangeListener) {
synchronized (sendStateChangeListeners) {
@@ -274,6 +280,8 @@
/**
* Removes listener ofchaning outbound message state.
+ *
+ * @param sent state change listener to remove
*/
public void removeSendStateChangeListener(SendStateChangeListener sendStateChangeListener) {
synchronized (sendStateChangeListeners) {
@@ -283,6 +291,8 @@
/**
* Sets state of device.
+ *
+ * @param state new state of device
*/
protected void setState(State state) {
this.state = state;
@@ -290,6 +300,8 @@
/**
* Returns state of device.
+ *
+ * @return state of device
*/
public State getState() {
return state;
@@ -297,6 +309,8 @@
/**
* Stub. Return unique name of device. It will be something like "Fax0001" "Fax0002".
+ *
+ * @return unique name of device
*/
public String getName() {
return name;
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/OutboundMessage.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -60,8 +60,7 @@
/**
* Creates new outbound message.
*
- * @param device
- * device which will send this message.
+ * @param device device which will send this message.
*/
public OutboundMessage(Device device) {
this.device = device;
@@ -126,8 +125,7 @@
/**
* Sets message mime type.
*
- * @param contentMimeType
- * mime type to set
+ * @param contentMimeType mime type to set
* @return true if given mime type is supported
*/
public boolean setContentMimeType(String contentMimeType) {
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/FaxInboundMessage.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -49,6 +49,13 @@
/**
* FaxDevice creates it after notification of new received Fax.
*
+ * @param device device receiving this message
+ * @param hylaFaxClient HylaFAX Client receiving this message
+ * @param messageId unique HylaFAX message id
+ * @param sourceAddress address of sender
+ * @param destinationAddress address of receiver
+ * @param contentMimeType mime type of message content
+ * @param fileName HylaFAX's FTP filename
* @throws FaxInboundMessageCreateException when inbound message is invalid, fax server's response is invalid, or fax server's response cannot be convered to pdf
*/
public FaxInboundMessage(FaxDevice device, HylaFAXClient hylaFaxClient, String messageId, String sourceAddress, String destinationAddress, String contentMimeType,
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/fax/polling/ReceivePollingJob.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -75,6 +75,7 @@
*
* @see FaxDevice#notifyReceive(org.comsuite.devices.InboundMessage)
* @param context job context, contains FaxDevice
+ * @throws JobExecutionException when any instruction of function fails
*/
public void execute(JobExecutionContext context) throws JobExecutionException {
final FaxDevice faxDevice = (FaxDevice) context.getJobDetail().getJobDataMap().get("FaxDevice");
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/sms/ReceivePollingJob.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -28,6 +28,7 @@
* @see FaxDevice.notifyReceive
* @param context
* job context, contains SmsDevice
+ * @throws JobExecutionException when any instruction of function fails
*/
public void execute(JobExecutionContext context) throws JobExecutionException {
// logger.info("execute");
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsDevice.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -290,6 +290,7 @@
/**
* Sends message throught GSM modem. Message can only have plain/text data.
*
+ * @param message message to send
* @throws DeviceInvalidOutboundMessageException
* message was created on another device
* @throws OutboundMessageInvalidContentMimeTypeException
Modified: trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/devices/sms/SmsOutboundMessage.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -20,7 +20,6 @@
*/
package org.commsuite.devices.sms;
-import java.util.ArrayList;
import java.util.List;
import javolution.util.FastTable;
Modified: trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/messaging/AbstractMessageConsumer.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -27,6 +27,8 @@
import org.commsuite.util.SpringMiddlewareContext;
/**
+ * Abstract message consumer is a class that can consume object of Message class from ActiveMQ queues.
+ *
* @since 1.0
* @author Marcin Zduniak
*/
@@ -34,6 +36,9 @@
private final static Logger logger = Logger.getLogger(AbstractMessageConsumer.class);
+ /**
+ * Creates new AbstractMessageConsumer.
+ */
public AbstractMessageConsumer() {
super(Message.class);
}
@@ -42,6 +47,11 @@
public abstract Status getMessageSentStatus();
+ /**
+ * Calls consumeMessage function. Before and after that it updates message status in database.
+ *
+ * @param obj Message object
+ */
public final boolean consumeQueueMessage(Object obj) {
// AbstractQueueMessageConsumer:47 - checking for object type
Message csMessage = (Message)obj;
@@ -72,6 +82,11 @@
return errorWhileConsumption;
}
+ /**
+ * Consumes Message object.
+ *
+ * @param msg Message object
+ */
public abstract void consumeMessage(Message msg);
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/notification/AbstractNotificationConsumer.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -81,6 +81,11 @@
return errorWhileConsumption;
}
+ /**
+ * Consumes notifications.
+ *
+ * @param notification Notification object
+ */
public abstract void consumeNotification(Notification notification);
}
Modified: trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java 2006-11-11 16:06:44 UTC (rev 217)
+++ trunk/code/CSMiddleware/src/org/commsuite/queue/IQueueManager.java 2006-11-16 22:00:24 UTC (rev 218)
@@ -40,6 +40,7 @@
/**
* Atomicaly creates new queue with given name and associates it with consumer consumer.
+ *
* @param queueName name of queue
* @param consumer queue consumer
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X