From 781188622953426a4b2dbe78fdd4baecaeb4e7c5 Mon Sep 17 00:00:00 2001 From: Brian Rosenberger Date: Tue, 5 Feb 2013 14:54:53 +0000 Subject: [PATCH] Arbeitsstand Anfang Februar git-svn-id: https://brutex.net/svn/xservices/trunk@116 e7e49efb-446e-492e-b9ec-fcafc1997a86 --- .../brutex/xservices/types/FileInfoType.java | 154 +++++++++--------- .../xservices/types/RuntimeInfoType.java | 81 ++++----- .../xservices/types/StringMatchDetails.java | 33 ++-- .../xservices/types/StringMatchType.java | 95 +++++------ .../xservices/types/StringReplaceType.java | 74 ++++----- 5 files changed, 223 insertions(+), 214 deletions(-) diff --git a/src/java/net/brutex/xservices/types/FileInfoType.java b/src/java/net/brutex/xservices/types/FileInfoType.java index 79b4139..835b921 100644 --- a/src/java/net/brutex/xservices/types/FileInfoType.java +++ b/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; - private String name; - private String path; - private long filesize; - private boolean canWrite; - private boolean isDirectory; - - public FileInfoType() { - } - - 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(); } + public FileInfoType() + { + } - /** - * @return the name - */ - @XmlElement(name="name") - public String getName() { - return name; - } + 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(); + } - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + @XmlElement(name="name") + public String getName() + { + return this.name; + } - /** - * @return the path - */ - @XmlElement(name="path") - public String getPath() { - return path; - } + public void setName(String name) + { + this.name = name; + } - /** - * @param path the path to set - */ - public void setPath(String path) { - this.path = path; - } + @XmlElement(name="path") + public String getPath() + { + return this.path; + } - /** - * @return the filesize - */ - @XmlElement(name="size") - public long getFilesize() { - return filesize; - } + public void setPath(String path) + { + this.path = path; + } - /** - * @param filesize the filesize to set - */ - public void setFilesize(long filesize) { - this.filesize = filesize; - } + @XmlElement(name="size") + public long getFilesize() + { + return this.filesize; + } - /** - * @return the canWrite - */ - @XmlElement(name="isWritable") - public boolean isCanWrite() { - return canWrite; - } + public void setFilesize(long filesize) + { + this.filesize = filesize; + } - /** - * @return the isDirectory - */ - @XmlElement(name="isDirectory") - public boolean isDirectory() { - return isDirectory; - } - - - -} + @XmlElement(name="isWritable") + public boolean isCanWrite() + { + return this.canWrite; + } + + @XmlElement(name="isDirectory") + public boolean isDirectory() + { + return this.isDirectory; + } +} \ No newline at end of file diff --git a/src/java/net/brutex/xservices/types/RuntimeInfoType.java b/src/java/net/brutex/xservices/types/RuntimeInfoType.java index 2bf70d6..e1d3fba 100644 --- a/src/java/net/brutex/xservices/types/RuntimeInfoType.java +++ b/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 { - - private final Runtime runtime = Runtime.getRuntime(); - - @XmlElement - public int getAvailableProcessors() { - return runtime.availableProcessors(); - } - - @XmlElement - public long getFreeMemory() { - return runtime.freeMemory(); - } - - @XmlElement - public long getFreeMemoryMB() { - return runtime.freeMemory() / 1024; - } - - @XmlElement - public long getMaxMemory() { - return runtime.maxMemory(); - } - - @XmlElement - public long getMaxMemoryMB() { - return runtime.maxMemory() / 1024; - } - - @XmlElement - public long getTotalMemory() { - return runtime.totalMemory(); - } - - @XmlElement - public long getTotalMemoryMB() { - return runtime.totalMemory() / 1024; - } +public class RuntimeInfoType +{ + private final Runtime runtime = Runtime.getRuntime(); + + @XmlElement + public int getAvailableProcessors() { + return this.runtime.availableProcessors(); + } + + @XmlElement + public long getFreeMemory() { + return this.runtime.freeMemory(); + } + + @XmlElement + public long getFreeMemoryMB() { + return this.runtime.freeMemory() / 1024L; + } + + @XmlElement + public long getMaxMemory() { + return this.runtime.maxMemory(); + } + + @XmlElement + public long getMaxMemoryMB() { + return this.runtime.maxMemory() / 1024L; + } + + @XmlElement + public long getTotalMemory() { + return this.runtime.totalMemory(); + } + + @XmlElement + public long getTotalMemoryMB() { + return this.runtime.totalMemory() / 1024L; + } } diff --git a/src/java/net/brutex/xservices/types/StringMatchDetails.java b/src/java/net/brutex/xservices/types/StringMatchDetails.java index 8b407f2..026e28d 100644 --- a/src/java/net/brutex/xservices/types/StringMatchDetails.java +++ b/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 { - public long startPosition; - public long endPosition; - public String content; +/** + * @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) { - this.startPosition = start; - this.endPosition = end; - this.content = content; - } + public StringMatchDetails(long start, long end, String group, String content) + { + this.startPosition = start; + this.endPosition = end; + this.group = group; + this.content = content; + } } \ No newline at end of file diff --git a/src/java/net/brutex/xservices/types/StringMatchType.java b/src/java/net/brutex/xservices/types/StringMatchType.java index 5fdf31a..de23688 100644 --- a/src/java/net/brutex/xservices/types/StringMatchType.java +++ b/src/java/net/brutex/xservices/types/StringMatchType.java @@ -1,50 +1,45 @@ -/* - * Copyright 2012 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.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@brutex.de - */ -@XmlType -public class StringMatchType { - public final List stringlist = new ArrayList(); - public int size=0; - - public StringMatchType() {} - - - public synchronized void addStringMatch(StringMatchDetails match) { - this.stringlist.add(match); - this.size++; - } - - public synchronized void addStringMatch(long start, long end, String content) { - StringMatchDetails details = new StringMatchDetails(start, end, content); - this.addStringMatch( details ); - } -} +/* + * 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.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlType; + +/** + * @author Brian Rosenberger, bru(at)brutex.de + * + */ + +@XmlType +public class StringMatchType +{ + public final List stringlist = new ArrayList(); + public int size = 0; + + public synchronized void addStringMatch(StringMatchDetails match) + { + this.stringlist.add(match); + this.size += 1; + } + + public synchronized void addStringMatch(long start, long end, String group, String content) { + StringMatchDetails details = new StringMatchDetails(start, end, group, content); + addStringMatch(details); + } +} diff --git a/src/java/net/brutex/xservices/types/StringReplaceType.java b/src/java/net/brutex/xservices/types/StringReplaceType.java index 1230bf7..f8f7cb4 100644 --- a/src/java/net/brutex/xservices/types/StringReplaceType.java +++ b/src/java/net/brutex/xservices/types/StringReplaceType.java @@ -1,37 +1,37 @@ -/* - * Copyright 2012 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 javax.xml.bind.annotation.XmlType; - - - -/** - * - * @author Brian Rosenberger, bru@brutex.de - */ -@XmlType -public class StringReplaceType { - public String string; - public int count; - public StringReplaceType() {} - public StringReplaceType(String string, int count) { - this(); - this.string = string; - this.count = count; - } -} +/* + * 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 javax.xml.bind.annotation.XmlType; + +@XmlType +public class StringReplaceType +{ + public String string; + public int count; + + public StringReplaceType() + { + } + + public StringReplaceType(String string, int count) + { + this(); + this.string = string; + this.count = count; + } +}