From a183ca30262564a8a190ad0bb8f7829b76dfa002 Mon Sep 17 00:00:00 2001 From: zapata Date: Sat, 24 Dec 2005 11:34:57 +0000 Subject: [PATCH] renamings --- .../mir/media/image/ImageMagickImageProcessor.java | 8 +- source/mir/util/GeneratorDateTimeFunctions.java | 54 +++----- source/mir/util/HTTPClientHelper.java | 1 - source/mir/util/InternetFunctions.java | 143 ++++++--------------- source/mir/util/InternetRoutines.java | 107 +++++++++++++++ .../{ExecFunctions.java => ShellRoutines.java} | 5 +- source/mircoders/abuse/IPFilterType.java | 8 +- 7 files changed, 174 insertions(+), 152 deletions(-) create mode 100755 source/mir/util/InternetRoutines.java rename source/mir/util/{ExecFunctions.java => ShellRoutines.java} (98%) mode change 100755 => 100644 diff --git a/source/mir/media/image/ImageMagickImageProcessor.java b/source/mir/media/image/ImageMagickImageProcessor.java index ac851ad4..c538d184 100755 --- a/source/mir/media/image/ImageMagickImageProcessor.java +++ b/source/mir/media/image/ImageMagickImageProcessor.java @@ -34,7 +34,7 @@ import mir.log.LoggerWrapper; import mir.media.MediaExc; import mir.media.MediaFailure; import mir.util.StreamCopier; -import mir.util.ExecFunctions; +import mir.util.ShellRoutines; import mir.config.MirPropertiesConfiguration; import java.io.*; @@ -148,7 +148,7 @@ public class ImageMagickImageProcessor implements ImageProcessor { */ public void readInfo() throws IOException { checkFile(); - String infoString = ExecFunctions.execIntoString + String infoString = ShellRoutines.execIntoString (getImageMagickPath() + "identify " + "-format \"%w %h %m %n \" " + file.getAbsolutePath()); // extra space, for multiframe (animations) @@ -169,7 +169,7 @@ public class ImageMagickImageProcessor implements ImageProcessor { Float.toString(aScalingFactor * 100) + "% " + result.file.getAbsolutePath(); logger.debug("ImageFile.scale:command:" + command); - ExecFunctions.simpleExec(command); + ShellRoutines.simpleExec(command); result.readInfo(); return result; } @@ -332,7 +332,7 @@ public class ImageMagickImageProcessor implements ImageProcessor { scaledImage.file.getAbsolutePath() + frame + " " + anImageType + ":" + temp.getAbsolutePath(); logger.debug("writeScaledData command:" + command); - ExecFunctions.simpleExec(command); + ShellRoutines.simpleExec(command); // copy temp file into stream StreamCopier.copy(new FileInputStream(temp), aStream); temp.delete(); diff --git a/source/mir/util/GeneratorDateTimeFunctions.java b/source/mir/util/GeneratorDateTimeFunctions.java index 234db7d0..48a2fa5c 100755 --- a/source/mir/util/GeneratorDateTimeFunctions.java +++ b/source/mir/util/GeneratorDateTimeFunctions.java @@ -50,48 +50,32 @@ public class GeneratorDateTimeFunctions { } public Object perform(List aParameters) throws GeneratorExc, GeneratorFailure { - try { - if (aParameters.size()<2 || aParameters.size()>3) - throw new GeneratorExc("dateFormatFunction []: 2 or 3 parameters expected"); - - if (!(aParameters.get(0) instanceof Date) || - !(aParameters.get(1) instanceof String) || - ( aParameters.size()>2 && - !(aParameters.get(2) instanceof String))) - throw new GeneratorExc("dateFormatFunction []: type mismatch"); + if (aParameters.size()<2 || aParameters.size()>3) { + throw new GeneratorExc("dateFormatFunction []: 2 or 3 parameters expected"); + } + if (!(aParameters.get(0) instanceof Date) || !(aParameters.get(1) instanceof String) || + (aParameters.size() > 2 && !(aParameters.get(2) instanceof String))) { + throw new GeneratorExc("dateFormatFunction []: type mismatch"); + } - Date date = (Date) aParameters.get(0); - SimpleDateFormat dateFormat = new SimpleDateFormat( (String) (aParameters.get(1))); + Date date = (Date) aParameters.get(0); + SimpleDateFormat dateFormat = new SimpleDateFormat( (String) (aParameters.get(1))); - String timezoneString = ""; - if (aParameters.size()>2) { - timezoneString = (String) aParameters.get(2); - } - else { - timezoneString = defaultTimezone; - } + String timezoneString = defaultTimezone; + if (aParameters.size()>2) { + timezoneString = (String) aParameters.get(2); + } - TimeZone timezone = null; - try { - timezone = TimeZone.getTimeZone(timezoneString); - } - catch (Throwable t) { - } + TimeZone timezone = TimeZone.getTimeZone(timezoneString); - if (timezone == null) - timezone = TimeZone.getDefault(); + if (timezone == null) { + timezone = TimeZone.getDefault(); + } - dateFormat.setTimeZone(timezone); + dateFormat.setTimeZone(timezone); - return dateFormat.format(date); - } - catch (GeneratorExc e) { - throw e; - } - catch (Throwable t) { - throw new GeneratorFailure("encodeURIGeneratorFunction: " + t.getMessage(), t); - } + return dateFormat.format(date); } } diff --git a/source/mir/util/HTTPClientHelper.java b/source/mir/util/HTTPClientHelper.java index 84bee4f9..68b21e68 100755 --- a/source/mir/util/HTTPClientHelper.java +++ b/source/mir/util/HTTPClientHelper.java @@ -48,7 +48,6 @@ public class HTTPClientHelper { client.setTimeout(5000); } - public InputStream getUrl(String anUrl) throws UtilExc { try { method = new GetMethod(anUrl); diff --git a/source/mir/util/InternetFunctions.java b/source/mir/util/InternetFunctions.java index a510aa30..bc6f5e57 100755 --- a/source/mir/util/InternetFunctions.java +++ b/source/mir/util/InternetFunctions.java @@ -1,107 +1,36 @@ -/* - * Copyright (C) 2001, 2002 The Mir-coders group - * - * This file is part of Mir. - * - * Mir is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Mir is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Mir; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * In addition, as a special exception, The Mir-coders gives permission to link - * the code of this program with the com.oreilly.servlet library, any library - * licensed under the Apache Software License, The Sun (tm) Java Advanced - * Imaging library (JAI), The Sun JIMI library (or with modified versions of - * the above that use the same license as the above), and distribute linked - * combinations including the two. You must obey the GNU General Public - * License in all respects for all of the code used other than the above - * mentioned libraries. If you modify this file, you may extend this exception - * to your version of the file, but you are not obligated to do so. If you do - * not wish to do so, delete this exception statement from your version. - */ - -package mir.util; - -import java.net.InetAddress; -import java.util.List; - -public class InternetFunctions { - private InternetFunctions() { - } - - public static boolean isIpAddressInNetwork(String anIpAddress, String aNetwork) throws Exception { - long ipAddress = parseHostNameOrIPAddress(anIpAddress); - long network = 0; - long netMask = (1L<<32)-1; - List networkParts = StringRoutines.separateString(aNetwork, "/"); - - network = parseHostNameOrIPAddress((String) networkParts.get(0)); - if (networkParts.size()>=2) { - netMask=parseNetmask((String) networkParts.get(1)); - } - - return (ipAddress & netMask ) == (network & netMask); - } - - public static long parseHostNameOrIPAddress(String aHostName) throws Exception { - InetAddress addr = InetAddress.getByName(aHostName.trim()); - return - ((((long) addr.getAddress()[0])&255) << 24) + - ((((long) addr.getAddress()[1])&255) << 16) + - ((((long) addr.getAddress()[2])&255) << 8) + - ((((long) addr.getAddress()[3])&255)); - } - - public static long parseIPAddress(String anIpAddress) throws Exception { - int[] parts = {0,0,0,0}; - int i; - List stringParts = StringRoutines.splitString(anIpAddress, "."); - - if (stringParts.size()!=4) - throw new Exception("Not a valid IP Address: " + anIpAddress); - - try { - for (i=0; i<4; i++) { - parts[i] = Integer.parseInt(((String) stringParts.get(i)).trim()); - } - } - catch (Throwable t) { - throw new Exception("Not a valid IP Address: " + anIpAddress); - } - for (i=0; i<4; i++) { - if (parts[i]<0 || parts[i]>255) - throw new Exception("Not a valid IP Address: " + anIpAddress); - } - - return parts[0]<<24 | parts[1]<<16 | parts[2]<<8 | parts[3]; - } - - public static long parseNetmask(String anIpAddress) throws Exception { - try { - return parseIPAddress(anIpAddress); - } - catch (Throwable t) { - } - - try { - int size = Integer.parseInt(anIpAddress); - - if (size<=32) - return ((1L<=2) { + netMask=parseNetmask((String) networkParts.get(1)); + } + + return (ipAddress & netMask ) == (network & netMask); + } + + public static long parseHostNameOrIPAddress(String aHostName) throws Exception { + InetAddress addr = InetAddress.getByName(aHostName.trim()); + return + ((((long) addr.getAddress()[0])&255) << 24) + + ((((long) addr.getAddress()[1])&255) << 16) + + ((((long) addr.getAddress()[2])&255) << 8) + + ((((long) addr.getAddress()[3])&255)); + } + + public static long parseIPAddress(String anIpAddress) throws Exception { + int[] parts = {0,0,0,0}; + int i; + List stringParts = StringRoutines.splitString(anIpAddress, "."); + + if (stringParts.size()!=4) + throw new Exception("Not a valid IP Address: " + anIpAddress); + + try { + for (i=0; i<4; i++) { + parts[i] = Integer.parseInt(((String) stringParts.get(i)).trim()); + } + } + catch (Throwable t) { + throw new Exception("Not a valid IP Address: " + anIpAddress); + } + for (i=0; i<4; i++) { + if (parts[i]<0 || parts[i]>255) + throw new Exception("Not a valid IP Address: " + anIpAddress); + } + + return parts[0]<<24 | parts[1]<<16 | parts[2]<<8 | parts[3]; + } + + public static long parseNetmask(String anIpAddress) throws Exception { + try { + return parseIPAddress(anIpAddress); + } + catch (Throwable t) { + } + + try { + int size = Integer.parseInt(anIpAddress); + + if (size<=32) + return ((1L<