Skip to content

Commit 1d4af60

Browse files
thomasWeisethomasWeise
committed
Patch for Overlapping Form Fields in GUI
1 parent a065655 commit 1d4af60

4 files changed

Lines changed: 23 additions & 21 deletions

File tree

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.optimizationBenchmarking</groupId>
66
<artifactId>evaluator-gui</artifactId>
7-
<version>0.8.8</version>
7+
<version>0.8.9</version>
88
<packaging>jar</packaging>
99
<name>The evaluator GUI.</name>
1010
<description>The optimizationBenchmarking.org evaluator GUI.</description>
@@ -44,9 +44,9 @@
4444
<project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
4545
<jdk.version>1.7</jdk.version>
4646
<junit.version>4.11</junit.version>
47-
<utils-base.version>${project.version}</utils-base.version>
48-
<evaluator-base.version>${utils-base.version}</evaluator-base.version>
49-
<evaluator-evaluator.version>${evaluator-base.version}</evaluator-evaluator.version>
47+
<utils-base.version>0.8.8</utils-base.version>
48+
<evaluator-base.version>0.8.8</evaluator-base.version>
49+
<evaluator-evaluator.version>0.8.9</evaluator-evaluator.version>
5050
<jetty.version>9.2.10.v20150310</jetty.version>
5151
</properties>
5252

‎src/main/java/org/optimizationBenchmarking/evaluator/gui/utils/editor/EditorModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ protected final void formPutAddField(final String prefix,
14521452
encoded.append(nameText);
14531453
}
14541454
out.write(
1455-
":</td><td class=\"addNameVal\"><input type=\"text\" size=\"60\" id=\"");//$NON-NLS-1$
1455+
":</td><td class=\"addNameVal\"><input type=\"text\" size=\"50\" id=\"");//$NON-NLS-1$
14561456
encoded.append(//
14571457
Page.fieldNameFromPrefixAndName(prefix,
14581458
EditorModule.NEW_FIELD_NAME));
@@ -1464,7 +1464,7 @@ protected final void formPutAddField(final String prefix,
14641464
encoded.append(valueText);
14651465
}
14661466
out.write(
1467-
":</td><td class=\"addValueVal\"><input type=\"text\" size=\"60\" id=\"");//$NON-NLS-1$
1467+
":</td><td class=\"addValueVal\"><input type=\"text\" size=\"50\" id=\"");//$NON-NLS-1$
14681468

14691469
encoded.append(//
14701470
Page.fieldNameFromPrefixAndName(prefix,
@@ -1524,7 +1524,7 @@ protected final void formPutAddTextField(final String prefix,
15241524
encoded.append(nameText);
15251525
}
15261526
out.write(
1527-
":</td><td class=\"addNameVal\"><input type=\"text\" size=\"60\" id=\"");//$NON-NLS-1$
1527+
":</td><td class=\"addNameVal\"><input type=\"text\" size=\"50\" id=\"");//$NON-NLS-1$
15281528
encoded.append(//
15291529
Page.fieldNameFromPrefixAndName(prefix,
15301530
EditorModule.NEW_FIELD_NAME));

‎src/main/resources/org/optimizationBenchmarking/evaluator/gui/application/ApplicationTool.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ project.name=GUI of the Optimization Benchmarking Tool Suite
33
project.jdk=${jdk.version}
44
project.url=${url}
55
contact.name=Thomas Weise
6-
contact.email=tweise@ustc.edu.cn
7-
contact.url=http://www.it-weise.de/
6+
contact.email=tweise@hfuu.edu.cn
7+
contact.url=http://iao.hfuu.edu.cn/

‎src/main/resources/webroot/about.jsp‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,23 @@ and <a href="http://www.github.com/optimizationBenchmarking">http://www.github.c
5252
<li>predecessor project: <a href="https://github.com/optimizationBenchmarking/tspSuite">tspSuite</a></li>
5353
</ul>
5454
<h2>Support and Funding</h2>
55-
<p>The main work in this project is conducted by Dr. Thomas Weise at the
56-
University of Science and Technology of China with support from the
57-
Fundamental Research Funds for the Central Universities. Further
55+
<p>The main work in this project is conducted by Prof. Dr. Thomas Weise at the
56+
Institute of Applied Optimization (IAO) of the Hefei University
57+
with support from
58+
NSFC Project 61673359 and the Fundamental Research Funds for the Central Universities.
59+
Further
5860
support is provided by the Faculty Strategic Initiatives Research Fund (SIRF) of the
5961
University of Newcastle and Dr. Raymond Chiong.</p>
6062
<h2 id="contact">Contact</h2>
6163
<table class="invisibleL">
62-
<tr class="invisibleL"><th class="invisibleL" colspan="2">Dr. Thomas Weise</th></tr>
63-
<tr class="invisibleL"><td class="invisibleL" colspan="2">Nature Inspired Computation and Applications Laboratory (NICAL)</td></tr>
64-
<tr class="invisibleL"><td class="invisibleL" colspan="2">USTC-Birmingham Joint Research Institute in Intelligent Computation and Its Applications (<a href="http://ubri.ustc.edu.cn">UBRI</a>)</td></tr>
65-
<tr class="invisibleL"><td class="invisibleL" colspan="2">School of Computer Science and Technology (<a href="http://cs.ustc.edu.cn/">SCST</a>)</td></tr>
66-
<tr class="invisibleL"><td class="invisibleL" colspan="2">University of Science and Technology of China (<a href="http://www.ustc.edu.cn">USTC</a>)</td></tr>
67-
<tr class="invisibleL"><td class="invisibleL" colspan="2">West Campus, Science and Technology Building, West Wing, Room 601</td></tr>
68-
<tr class="invisibleL"><td class="invisibleL" colspan="2">Huangshan Road/Feixi Road, Hefei 230027, Anhui, China</td></tr>
69-
<tr class="invisibleL"><td class="invisibleL">Web:</td><td class="invisibleL">&nbsp;<a href="http://www.it-weise.de/">http://www.it-weise.de/</a></td></tr>
70-
<tr class="invisibleL"><td class="invisibleL">Email:</td><td class="invisibleL">&nbsp;<a href="mailto:tweise@gmx.de">tweise@gmx.de</a>, <a href="mailto:tweise@ustc.edu.cn">tweise@ustc.edu.cn</a></td></tr>
64+
<tr class="invisibleL"><th class="invisibleL" colspan="2">Prof. Dr. Thomas Weise</th></tr>
65+
<tr class="invisibleL"><td class="invisibleL" colspan="2">Institute of Applied Optimization (<a href="http://iao.hfuu.edu.cn/">IAO</a>)</td></tr>
66+
<tr class="invisibleL"><td class="invisibleL" colspan="2">Faculty of Computer Science and Technology</td></tr>
67+
<tr class="invisibleL"><td class="invisibleL" colspan="2"><a href="http://www.hfuu.edu.cn">Hefei University</a></td></tr>
68+
<tr class="invisibleL"><td class="invisibleL" colspan="2">South Campus 2, Building 36, Office 324, Jinxiu Dadao 99</td></tr>
69+
<tr class="invisibleL"><td class="invisibleL" colspan="2">Hefei Economic and Technological Development Area</td></tr>
70+
<tr class="invisibleL"><td class="invisibleL" colspan="2">Hefei 230601, Anhui, China</td></tr>
71+
<tr class="invisibleL"><td class="invisibleL">Web:</td><td class="invisibleL">&nbsp;<a href="http://iao.hfuu.edu.cn/">http://iao.hfuu.edu.cn/</a></td></tr>
72+
<tr class="invisibleL"><td class="invisibleL">Email:</td><td class="invisibleL">&nbsp;<a href="mailto:tweise@gmx.de">tweise@gmx.de</a>, <a href="mailto:tweise@hfuu.edu.cn">tweise@hfuu.edu.cn</a></td></tr>
7173
</table>
7274
<%@include file="/includes/defaultFooter.jsp" %>

0 commit comments

Comments
 (0)