diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-editors/jext/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-editors/jext/files')
-rw-r--r-- | app-editors/jext/files/jext-5.0-enum-as-keyword.patch | 173 | ||||
-rw-r--r-- | app-editors/jext/files/jext-pre | 91 |
2 files changed, 0 insertions, 264 deletions
diff --git a/app-editors/jext/files/jext-5.0-enum-as-keyword.patch b/app-editors/jext/files/jext-5.0-enum-as-keyword.patch deleted file mode 100644 index c773e571d182..000000000000 --- a/app-editors/jext/files/jext-5.0-enum-as-keyword.patch +++ /dev/null @@ -1,173 +0,0 @@ ---- src/lib/org/gjt/sp/jedit/textarea/InputHandler.java.orig 2015-07-03 17:52:13.843000000 +0000 -+++ src/lib/org/gjt/sp/jedit/textarea/InputHandler.java 2015-07-03 17:52:59.746000000 +0000 -@@ -141,10 +141,10 @@ - */ - public static String getActionName(ActionListener listener) - { -- Enumeration enum = getActions(); -- while(enum.hasMoreElements()) -+ Enumeration myEnum = getActions(); -+ while(myEnum.hasMoreElements()) - { -- String name = (String)enum.nextElement(); -+ String name = (String)myEnum.nextElement(); - ActionListener _listener = getAction(name); - if(_listener == listener) - return name; ---- src/lib/org/jext/options/OptionsDialog.java.orig 2015-07-03 17:54:19.179000000 +0000 -+++ src/lib/org/jext/options/OptionsDialog.java 2015-07-03 17:54:33.377000000 +0000 -@@ -297,11 +297,11 @@ - - private void addOptionGroup(OptionGroup child, OptionGroup parent) - { -- ArrayList enum = child.getMembers(); -+ ArrayList myEnum = child.getMembers(); - -- for (int i = 0; i < enum.size(); i++) -+ for (int i = 0; i < myEnum.size(); i++) - { -- Object elem = enum.get(i); -+ Object elem = myEnum.get(i); - - if (elem instanceof OptionPane) - { -@@ -669,4 +669,4 @@ - - } - --// End of OptionsDialog.java -\ No newline at end of file -+// End of OptionsDialog.java ---- src/lib/org/jext/misc/VirtualFolders.java.orig 2015-07-03 17:49:57.731000000 +0000 -+++ src/lib/org/jext/misc/VirtualFolders.java 2015-07-03 17:51:11.418000000 +0000 -@@ -233,10 +233,10 @@ - ret.append(crlf).append("<folderlist>"); - } - -- Enumeration enum = parent.children(); -- while (enum.hasMoreElements()) -+ Enumeration myEnum = parent.children(); -+ while (myEnum.hasMoreElements()) - { -- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement(); -+ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement(); - ret.append(toXML(child, depth + 1)); - } - -@@ -317,20 +317,20 @@ - - private void fixVisible() - { -- Enumeration enum = root.depthFirstEnumeration(); -+ Enumeration myEnum = root.depthFirstEnumeration(); - VirtualFolderNode node = null; -- while (enum.hasMoreElements()) -+ while (myEnum.hasMoreElements()) - { - -- node = (VirtualFolderNode)enum.nextElement(); -+ node = (VirtualFolderNode)myEnum.nextElement(); - TreePath path = new TreePath(node.getPath()); - tree.collapsePath(path); - } - -- enum = root.depthFirstEnumeration(); -- while (enum.hasMoreElements()) -+ myEnum = root.depthFirstEnumeration(); -+ while (myEnum.hasMoreElements()) - { -- node = (VirtualFolderNode)enum.nextElement(); -+ node = (VirtualFolderNode)myEnum.nextElement(); - if (node.shouldBeVisible()) - { - TreePath path = new TreePath(((VirtualFolderNode)node.getParent()).getPath()); -@@ -392,10 +392,10 @@ - public static boolean folderExists(VirtualFolderNode parent, String name) - { - boolean exists = false; -- Enumeration enum = parent.children(); -- while ((enum.hasMoreElements()) && !exists) -+ Enumeration myEnum = parent.children(); -+ while ((myEnum.hasMoreElements()) && !exists) - { -- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement(); -+ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement(); - exists = child.toString().equals(name); - } - return exists; -@@ -526,10 +526,10 @@ - } else { - if (fromMenu) - { -- Enumeration enum = node.children(); -- while (enum.hasMoreElements()) -+ Enumeration myEnum = node.children(); -+ while (myEnum.hasMoreElements()) - { -- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement(); -+ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement(); - openNode(child, fromMenu); - } - } ---- src/lib/com/microstar/xml/XmlParser.java.orig 2015-07-03 17:41:23.209000000 +0000 -+++ src/lib/com/microstar/xml/XmlParser.java 2015-07-03 17:46:30.296000000 +0000 -@@ -1346,7 +1346,7 @@ - { - String name; - int type; -- String enum = null; -+ String myEnum = null; - - // Read the attribute name. - name = readNmtoken(true); -@@ -1358,12 +1358,12 @@ - // Get the string of enumerated values - // if necessary. - if (type == ATTRIBUTE_ENUMERATED || type == ATTRIBUTE_NOTATION) { -- enum = dataBufferToString(); -+ myEnum = dataBufferToString(); - } - - // Read the default value. - requireWhitespace(); -- parseDefault(elementName, name, type, enum); -+ parseDefault(elementName, name, type, myEnum); - } - - -@@ -1451,7 +1451,7 @@ - * Parse the default value for an attribute. - * [62] Default ::= '#REQUIRED' | '#IMPLIED' | ((%'#FIXED' S)? %AttValue - */ -- void parseDefault (String elementName, String name, int type, String enum) -+ void parseDefault (String elementName, String name, int type, String myEnum) - throws java.lang.Exception - { - int valueType = ATTRIBUTE_DEFAULT_SPECIFIED; -@@ -1477,7 +1477,7 @@ - value = readLiteral(LIT_CHAR_REF); - context = CONTEXT_DTD; - } -- setAttribute(elementName, name, type, enum, value, valueType); -+ setAttribute(elementName, name, type, myEnum, value, valueType); - } - - -@@ -2714,7 +2714,7 @@ - * - int value type - * *TODO: do something with attribute types. - */ -- void setAttribute (String elName, String name, int type, String enumeration, -+ void setAttribute (String elName, String name, int type, String myEnum, - String value, int valueType) - throws java.lang.Exception - { -@@ -2736,7 +2736,7 @@ - attribute[0] = new Integer(type); - attribute[1] = value; - attribute[2] = new Integer(valueType); -- attribute[3] = enumeration; -+ attribute[3] = myEnum; - attribute[4] = null; - attlist.put(name.intern(), attribute); - diff --git a/app-editors/jext/files/jext-pre b/app-editors/jext/files/jext-pre deleted file mode 100644 index 5a02d4b71db8..000000000000 --- a/app-editors/jext/files/jext-pre +++ /dev/null @@ -1,91 +0,0 @@ -# This script launches Jext, the Java text editor. -# It checks for a $HOME/.jext directory and eventually creates it. -# Next it checks for a /etc/jextrc and $JEXT_CONFFILE (~/.jext/variables) files which define the JEXT_HOME JAVA_CMD JAVA_OPT CLASSPATH and ToShow variables. The first is system wide(used in RPM install mainly), the second is per user. -# If this file doesn't exist the script creates it by asking the options to the user. - -# Sharpshooter 23/02/2002 -# Blaisorblade 18/11/2002 - -#For special cases about different config files(for developers with working -#copy and an unstable one to be tested). -if [ "$JEXT_CONFFILE" = "" ] -then - JEXT_CONFFILE=~/.jext/variables -fi - -# Help -if [ "$1" = "--help" -o "$1" = "-h" ] -then - echo "This script launch Jext the Java text editor." - echo "Usage : $0 [--reconf] [files]" - echo "--reconf doesn't start jext but clears the" - echo " $JEXT_CONFFILE file with the settings to start jext" - echo " (jext & java location and jext options)." - exit 0 -fi - -if [ "$1" = "--reconf" ] -then - echo "Clearing $JEXT_CONFFILE, you'll have to reenter jext & java \ -interpreter location" - rm -f "$JEXT_CONFFILE" - exit 0 -fi - - -# Check for the user's ~/.jext directory. -if ! [ -d ~/.jext ] -then - echo "It seems you don't have a .jext directory in your home dir." - echo "I create it." - echo - mkdir -p ~/.jext/xinsert -fi - - - -# Check for the $HOME/.jext/variables file. -if ! [ -f $JEXT_CONFFILE -o -f /etc/jextrc ] -then - #Let's add some explaination in the config file. - cat >$JEXT_CONFFILE <<EOM -#This is included when launching Jext. It is a normal shell script \ -used to define env vars -#Meanings of settings: -#JEXT_HOME The home dir of jext(under which it finds the lib and so on dirs) -#JAVA_CMD The complete path for the java command -#JAVA_OPT The options to be passed to the java command(not to Jext itself!) -#CLASSPATH The extra classpath to be specified(for cases such as AntWork plugin) -#ToShow If this is set to y the output is not redirected to /dev/null; -# Mainly for developers who want to trace Jext output(you could also use -# the DickTracy plugin). -EOM -#---- - JEXT_HOME="/usr/share/jext/lib" - echo "JEXT_HOME="$JEXT_HOME >> $JEXT_CONFFILE -#---- - ToShow= - echo "ToShow="$ToShow>>$JEXT_CONFFILE -fi - -# Extract the contents of the $JEXT_CONFFILE file. -[ -f /etc/jextrc ] && source /etc/jextrc -[ -f $JEXT_CONFFILE ] && source $JEXT_CONFFILE - -#Needed to make Jext find his plugins(it searches them in `pwd`/plugins) -for i in $@ -do - if [ "${i:0:1}" != "/" -a "${i:0:1}" != "-" ]; then #If the first char of $i is not a / then - files="$files `pwd`/$i" #it is a relative path so we must make it absolute. - elif [ "$i" != "-" ]; then - files="$files $i" - else - case "$i" in - --reconf|--help|-h) - ;; - *) - files="$files $i" - ;; - esac - fi -done |