You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/02/20 18:29:31 UTC
svn commit: r509673 - in /lenya/trunk/src/modules-core/administration:
java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
usecases/ipRangeProfile.jx
Author: andreas
Date: Tue Feb 20 09:29:29 2007
New Revision: 509673
URL: http://svn.apache.org/viewvc?view=rev&rev=509673
Log:
Fixed IP range profile
Modified:
lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx
Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java?view=diff&rev=509673&r1=509672&r2=509673
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java Tue Feb 20 09:29:29 2007
@@ -42,7 +42,7 @@
protected void doCheckExecutionConditions() throws Exception {
IPRangeProfile.validateAddresses(this);
}
-
+
/**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
@@ -51,15 +51,15 @@
String name = getParameterAsString(NAME);
String description = getParameterAsString(DESCRIPTION);
-
+
IPRange ipRange = getIPRange();
ipRange.setName(name);
ipRange.setDescription(description);
-
+
String networkString = "";
String subnetString = "";
-
+
for (int i = 0; i < 4; i++) {
if (i > 0) {
networkString += ".";
@@ -91,7 +91,8 @@
}
/**
- * @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String, java.lang.Object)
+ * @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String,
+ * java.lang.Object)
*/
public void setParameter(String name, Object value) {
super.setParameter(name, value);
@@ -111,9 +112,10 @@
List partNumbers = new ArrayList();
for (byte i = 0; i < 4; i++) {
- setParameter(NETWORK_ADDRESS + "-" + i, new Part(i, ""
- + networkAddress.getAddress()[i]));
- setParameter(SUBNET_MASK + "-" + i, new Part(i, "" + subnetMask.getAddress()[i]));
+ String addrPart = Integer.toString(0xFF & networkAddress.getAddress()[i]);
+ setParameter(NETWORK_ADDRESS + "-" + i, new Part(i, addrPart));
+ String maskPart = Integer.toString(0xFF & subnetMask.getAddress()[i]);
+ setParameter(SUBNET_MASK + "-" + i, new Part(i, maskPart));
partNumbers.add(new Integer(i));
}
setParameter(IPRangeProfile.PART_NUMBERS, partNumbers);
Modified: lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx?view=diff&rev=509673&r1=509672&r2=509673
==============================================================================
--- lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx Tue Feb 20 09:29:29 2007
@@ -45,14 +45,12 @@
<tr>
<td class="lenya-entry-caption"><i18n:text>Name</i18n:text>:</td>
- <td><input type="text" name="name" class="lenya-form-entry" value="${request.getParameter('name')}"/></td>
+ <td><input type="text" name="name" class="lenya-form-entry" value="${usecase.getParameter('name')}"/></td>
</tr>
<tr>
<td valign="top" class="lenya-entry-caption"><i18n:text>Description</i18n:text>:</td>
<td>
- <textarea name="description" class="lenya-form-entry">
- <jx:out value="${request.getParameter('description')}"/>
- </textarea>
+ <textarea name="description" class="lenya-form-entry"><jx:out value="${usecase.getParameter('description')}"/></textarea>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org