Arbeitsstand Anfang Februar

git-svn-id: https://brutex.net/svn/xservices/trunk@116 e7e49efb-446e-492e-b9ec-fcafc1997a86

src/java/net/brutex/xservices/types/FileInfoType.java

@@ -1,91 +1,95 @@
+/*
+ *   Copyright 2013 Brian Rosenberger (Brutex Network)
+ *
+ *   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 net.brutex.xservices.types;
 
 import java.io.File;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+/**
+ * @author Brian Rosenberger, bru(at)brutex.de
+ *
+ */
+
+
 
 @XmlRootElement
-public class FileInfoType {
+public class FileInfoType
-
+{
   private String name;
   private String path;
   private long filesize;
   private boolean canWrite;
   private boolean isDirectory;
 
-	public FileInfoType() {
+  public FileInfoType()
+  {
   }
 
-	public FileInfoType(File file) {
+  public FileInfoType(File file)
+  {
     this.name = file.getName();
     this.path = file.getAbsolutePath().replace('\\', '/');
     this.canWrite = file.canWrite();
     this.filesize = file.length();
-		this.isDirectory = file.isDirectory();	}
+    this.isDirectory = file.isDirectory();
-
-	/**
-	 * @return the name
-	 */
-	@XmlElement(name="name")
-	public String getName() {
-		return name;
   }
 
-	/**
+  @XmlElement(name="name")
-	 * @param name the name to set
+  public String getName()
-	 */
+  {
-	public void setName(String name) {
+    return this.name;
+  }
+
+  public void setName(String name)
+  {
     this.name = name;
   }
 
-	/**
-	 * @return the path
-	 */
   @XmlElement(name="path")
-	public String getPath() {
+  public String getPath()
-		return path;
+  {
+    return this.path;
   }
 
-	/**
+  public void setPath(String path)
-	 * @param path the path to set
+  {
-	 */
-	public void setPath(String path) {
     this.path = path;
   }
 
-	/**
-	 * @return the filesize
-	 */
   @XmlElement(name="size")
-	public long getFilesize() {
+  public long getFilesize()
-		return filesize;
+  {
+    return this.filesize;
   }
 
-	/**
+  public void setFilesize(long filesize)
-	 * @param filesize the filesize to set
+  {
-	 */
-	public void setFilesize(long filesize) {
     this.filesize = filesize;
   }
 
-	/**
-	 * @return the canWrite
-	 */
   @XmlElement(name="isWritable")
-	public boolean isCanWrite() {
+  public boolean isCanWrite()
-		return canWrite;
+  {
+    return this.canWrite;
   }
 
-	/**
-	 * @return the isDirectory
-	 */
   @XmlElement(name="isDirectory")
-	public boolean isDirectory() {
+  public boolean isDirectory()
-		return isDirectory;
+  {
+    return this.isDirectory;
   }
-	
-	
-	
 }

src/java/net/brutex/xservices/types/RuntimeInfoType.java

@@ -18,46 +18,47 @@ package net.brutex.xservices.types;
 
 import javax.xml.bind.annotation.XmlElement;
 
-/*
+/**
- * Information about processors and memory
+ * @author Brian Rosenberger, bru(at)brutex.de
+ *
  */
-public class RuntimeInfoType {
 
+public class RuntimeInfoType
+{
   private final Runtime runtime = Runtime.getRuntime();
 
   @XmlElement
   public int getAvailableProcessors() {
-		return runtime.availableProcessors();
+    return this.runtime.availableProcessors();
   }
 
   @XmlElement
   public long getFreeMemory() {
-		return runtime.freeMemory();
+    return this.runtime.freeMemory();
   }
 
   @XmlElement
   public long getFreeMemoryMB() {
-		return runtime.freeMemory() / 1024;
+    return this.runtime.freeMemory() / 1024L;
   }
 
   @XmlElement
   public long getMaxMemory() {
-		return runtime.maxMemory();
+    return this.runtime.maxMemory();
   }
 
   @XmlElement
   public long getMaxMemoryMB() {
-		return runtime.maxMemory() / 1024;
+    return this.runtime.maxMemory() / 1024L;
   }
 
   @XmlElement
   public long getTotalMemory() {
-		return runtime.totalMemory();
+    return this.runtime.totalMemory();
   }
 
   @XmlElement
   public long getTotalMemoryMB() {
-		return runtime.totalMemory() / 1024;
+    return this.runtime.totalMemory() / 1024L;
   }
-
 }

src/java/net/brutex/xservices/types/StringMatchDetails.java

@@ -1,5 +1,5 @@
 /*
- *   Copyright 2012 Brian Rosenberger (Brutex Network)
+ *   Copyright 2013 Brian Rosenberger (Brutex Network)
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -16,17 +16,26 @@
 
 package net.brutex.xservices.types;
 
-public class StringMatchDetails {
+/**
+ * @author Brian Rosenberger, bru(at)brutex.de
+ *
+ */
+public class StringMatchDetails
+{
   public long startPosition;
   public long endPosition;
   public String content;
+  public String group;
 
-	public StringMatchDetails() {
+  public StringMatchDetails()
+  {
   }
 
-	public StringMatchDetails(long start, long end, String content) {
+  public StringMatchDetails(long start, long end, String group, String content)
+  {
     this.startPosition = start;
     this.endPosition = end;
+    this.group = group;
     this.content = content;
   }
 }

src/java/net/brutex/xservices/types/StringMatchType.java

@@ -1,5 +1,5 @@
 /*
- *   Copyright 2012 Brian Rosenberger (Brutex Network)
+ *   Copyright 2013 Brian Rosenberger (Brutex Network)
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -16,35 +16,30 @@
 
 package net.brutex.xservices.types;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlType;
 
-import com.sun.xml.txw2.annotation.XmlElement;
-
-
-
 /**
+ * @author Brian Rosenberger, bru(at)brutex.de
  *
- * @author Brian Rosenberger, bru@brutex.de
  */
+
 @XmlType
-public class StringMatchType {
+public class StringMatchType
-	public final List<StringMatchDetails> stringlist = new ArrayList<StringMatchDetails>();
+{
+  public final List<StringMatchDetails> stringlist = new ArrayList();
   public int size = 0;
 
-	public StringMatchType() {}
+  public synchronized void addStringMatch(StringMatchDetails match)
-	
+  {
-	
-	public synchronized void addStringMatch(StringMatchDetails match) {
     this.stringlist.add(match);
-		this.size++;
+    this.size += 1;
   }
 
-	public synchronized void addStringMatch(long start, long end, String content) {
+  public synchronized void addStringMatch(long start, long end, String group, String content) {
-		StringMatchDetails details = new StringMatchDetails(start, end, content);
+    StringMatchDetails details = new StringMatchDetails(start, end, group, content);
-		this.addStringMatch( details );
+    addStringMatch(details);
   }
 }

src/java/net/brutex/xservices/types/StringReplaceType.java

@@ -1,5 +1,5 @@
 /*
- *   Copyright 2012 Brian Rosenberger (Brutex Network)
+ *   Copyright 2013 Brian Rosenberger (Brutex Network)
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -18,18 +18,18 @@ package net.brutex.xservices.types;
 
 import javax.xml.bind.annotation.XmlType;
 
-
-
-/**
- *
- * @author Brian Rosenberger, bru@brutex.de
- */
 @XmlType
-public class StringReplaceType {
+public class StringReplaceType
+{
   public String string;
   public int count;
-	public StringReplaceType() {}
+
-	public StringReplaceType(String string, int count) {
+  public StringReplaceType()
+  {
+  }
+
+  public StringReplaceType(String string, int count)
+  {
     this();
     this.string = string;
     this.count = count;