Menu
▾
▴
gridarta-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(103) |
Jun
(121) |
Jul
(16) |
Aug
(67) |
Sep
(126) |
Oct
(161) |
Nov
(164) |
Dec
(588) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(394) |
Feb
(181) |
Mar
(131) |
Apr
(180) |
May
(255) |
Jun
(11) |
Jul
(79) |
Aug
(70) |
Sep
(274) |
Oct
(138) |
Nov
(195) |
Dec
(8) |
| 2008 |
Jan
(3) |
Feb
(142) |
Mar
(162) |
Apr
(124) |
May
(148) |
Jun
(157) |
Jul
(425) |
Aug
(373) |
Sep
(264) |
Oct
(315) |
Nov
(225) |
Dec
(6) |
| 2009 |
Jan
(67) |
Feb
(78) |
Mar
(279) |
Apr
(294) |
May
(92) |
Jun
(65) |
Jul
(134) |
Aug
(41) |
Sep
(138) |
Oct
(125) |
Nov
(126) |
Dec
(122) |
| 2010 |
Jan
(15) |
Feb
(48) |
Mar
(9) |
Apr
(195) |
May
(373) |
Jun
(507) |
Jul
(42) |
Aug
(16) |
Sep
(38) |
Oct
(81) |
Nov
(64) |
Dec
(18) |
| 2011 |
Jan
(13) |
Feb
(12) |
Mar
(39) |
Apr
(1) |
May
(2) |
Jun
(27) |
Jul
(27) |
Aug
(31) |
Sep
(14) |
Oct
(102) |
Nov
(20) |
Dec
(37) |
| 2012 |
Jan
(22) |
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(18) |
Jul
(6) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(47) |
Jun
(7) |
Jul
(107) |
Aug
|
Sep
|
Oct
(112) |
Nov
(31) |
Dec
(17) |
| 2014 |
Jan
(29) |
Feb
(111) |
Mar
(34) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(18) |
Dec
(10) |
|
From: <aki...@us...> - 2010-05-22 14:00:06
|
Revision: 7860
http://gridarta.svn.sourceforge.net/gridarta/?rev=7860&view=rev
Author: akirschbaum
Date: 2010-05-22 13:59:59 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Add @ActionMethod annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2010-05-22 13:59:07 UTC (rev 7859)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2010-05-22 13:59:59 UTC (rev 7860)
@@ -59,6 +59,7 @@
import net.sf.gridarta.utils.RandomUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -574,6 +575,7 @@
/**
* Action method for Ok button.
*/
+ @ActionMethod
public void replaceOk() {
if (doReplace()) {
dialog.setVisible(false);
@@ -583,6 +585,7 @@
/**
* Action method for Apply button.
*/
+ @ActionMethod
public void replaceApply() {
doReplace();
}
@@ -640,6 +643,7 @@
/**
* Action method for Cancel button.
*/
+ @ActionMethod
public void replaceCancel() {
dialog.setVisible(false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:59:13
|
Revision: 7859
http://gridarta.svn.sourceforge.net/gridarta/?rev=7859&view=rev
Author: akirschbaum
Date: 2010-05-22 13:59:07 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Remove ReplaceDialogManager.mapViewManagerListener.
Modified Paths:
--------------
trunk/gridarta.iml
trunk/gridarta.ipr
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
Modified: trunk/gridarta.iml
===================================================================
--- trunk/gridarta.iml 2010-05-22 13:57:53 UTC (rev 7858)
+++ trunk/gridarta.iml 2010-05-22 13:59:07 UTC (rev 7859)
@@ -9,6 +9,7 @@
<excludeFolder url="file://$MODULE_DIR$/crossfire" />
<excludeFolder url="file://$MODULE_DIR$/daimonin" />
<excludeFolder url="file://$MODULE_DIR$/dest" />
+ <excludeFolder url="file://$MODULE_DIR$/doc" />
<excludeFolder url="file://$MODULE_DIR$/docs" />
<excludeFolder url="file://$MODULE_DIR$/metrics" />
<excludeFolder url="file://$MODULE_DIR$/src/screenshots" />
@@ -124,7 +125,9 @@
<root url="jar://$MODULE_DIR$/lib/japi-lib-swing-action-0.1.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="file://$MODULE_DIR$/../../japi/libs/swing-action/trunk/src/prj" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2010-05-22 13:57:53 UTC (rev 7858)
+++ trunk/gridarta.ipr 2010-05-22 13:59:07 UTC (rev 7859)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="false" version="4">
+<project version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
</component>
@@ -52,6 +52,7 @@
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+ <option name="PREFER_LONGER_NAMES" value="false" />
<option name="GENERATE_FINAL_LOCALS" value="true" />
<option name="GENERATE_FINAL_PARAMETERS" value="true" />
<option name="USE_FQ_CLASS_NAMES_IN_JAVADOC" value="false" />
@@ -62,11 +63,11 @@
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
- <package name="" withSubpackages="true" />
+ <package name="" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="" withSubpackages="true" static="true" />
</value>
</option>
- <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
- <option name="ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY" value="true" />
<option name="RIGHT_MARGIN" value="80" />
<option name="WRAP_COMMENTS" value="true" />
<option name="IF_BRACE_FORCE" value="3" />
@@ -76,16 +77,6 @@
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
<option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
- <option name="JD_P_AT_EMPTY_LINES" value="false" />
- <ADDITIONAL_INDENT_OPTIONS fileType="">
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="groovy">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
@@ -128,7 +119,6 @@
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
- <option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -153,11 +143,13 @@
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
</wildcardResourcePatterns>
+ <annotationProcessing enabled="false" useClasspath="true" />
</component>
<component name="CopyrightManager" default="Gridarta">
<copyright>
<option name="notice" value="Gridarta MMORPG map editor for Crossfire, Daimonin and similar games. Copyright (C) 2000-2010 The Gridarta Developers. This program 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. This program 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 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." />
<option name="keyword" value="Copyright" />
+ <option name="allowReplaceKeyword" value="" />
<option name="myName" value="Gridarta" />
<option name="myLocal" value="true" />
</copyright>
@@ -168,13 +160,6 @@
<component name="DependencyValidationManager">
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
- <component name="EclipseCompilerSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="DEPRECATION" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
- </component>
<component name="EclipseEmbeddedCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
@@ -195,590 +180,557 @@
</component>
<component name="IdProvider" IDEtalkID="334126487A954321E4EE61978AD5E372" />
<component name="InspectionProjectProfileManager">
- <option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- <scopes />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
- <inspection_tool class="CssOverwrittenProperties" level="WARNING" enabled="false" />
- <inspection_tool class="InconsistentResourceBundle" level="ERROR" enabled="false">
- <option name="REPORT_MISSING_TRANSLATIONS" value="true" />
- <option name="REPORT_INCONSISTENT_PROPERTIES" value="true" />
- <option name="REPORT_DUPLICATED_PROPERTIES" value="true" />
+ <inspection_tool class="AbstractClassExtendsConcreteClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AbstractClassNeverImplemented" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AbstractClassWithoutAbstractMethods" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AbstractMethodCallInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AbstractMethodOverridesAbstractMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AbstractMethodOverridesConcreteMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AbstractMethodWithMissingImplementations" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AnonymousClassVariableHidesContainingMethodVariable" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ArchaicSystemPropertyAccess" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AssignmentToCatchBlockParameter" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AssignmentToForLoopParameter" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_checkForeachParameters" value="false" />
</inspection_tool>
- <inspection_tool class="SimplifiableIfStatement" level="WARNING" enabled="false" />
- <inspection_tool class="InfiniteLoopStatement" level="WARNING" enabled="false" />
- <inspection_tool class="UnnecessaryLabelOnContinueStatement" level="WARNING" enabled="false" />
- <inspection_tool class="RequiredAttributes" level="WARNING" enabled="false">
- <option name="myAdditionalRequiredHtmlAttributes" value="" />
+ <inspection_tool class="AssignmentToMethodParameter" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreTransformationOfOriginalParameter" value="false" />
</inspection_tool>
- <inspection_tool class="UnusedMessageFormatParameter" level="WARNING" enabled="false" />
- <inspection_tool class="DefaultFileTemplate" level="WARNING" enabled="false">
- <option name="CHECK_FILE_HEADER" value="true" />
- <option name="CHECK_TRY_CATCH_SECTION" value="true" />
- <option name="CHECK_METHOD_BODY" value="true" />
+ <inspection_tool class="AssignmentToNull" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AssignmentToStaticFieldFromInstanceMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="AssignmentUsedAsCondition" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="BadExceptionCaught" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="exceptionsString" value="java.lang.NullPointerException,java.lang.IllegalMonitorStateException,java.lang.ArrayIndexOutOfBoundsException" />
</inspection_tool>
- <inspection_tool class="UnnecessaryReturn" level="WARNING" enabled="false" />
- <inspection_tool class="BooleanMethodIsAlwaysInverted" level="WARNING" enabled="false" />
- <inspection_tool class="PointlessBitwiseExpression" level="WARNING" enabled="false">
- <option name="m_ignoreExpressionsContainingConstants" value="false" />
+ <inspection_tool class="BadExceptionDeclared" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="exceptionsString" value="java.lang.Throwable,java.lang.Exception,java.lang.Error,java.lang.RuntimeException,java.lang.NullPointerException,java.lang.ClassCastException,java.lang.ArrayIndexOutOfBoundsException" />
+ <option name="ignoreTestCases" value="false" />
</inspection_tool>
- <inspection_tool class="SimplifiableConditionalExpression" level="WARNING" enabled="false" />
- <inspection_tool class="CssUnitlessNumber" level="WARNING" enabled="false" />
- <inspection_tool class="ConstantIfStatement" level="WARNING" enabled="false" />
- <inspection_tool class="CheckValidXmlInScriptTagBody" level="ERROR" enabled="false" />
- <inspection_tool class="UnnecessaryLocalVariable" level="WARNING" enabled="false">
- <option name="m_ignoreImmediatelyReturnedVariables" value="false" />
- <option name="m_ignoreAnnotatedVariables" value="false" />
+ <inspection_tool class="BadExceptionThrown" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="exceptionsString" value="java.lang.Throwable,java.lang.Exception,java.lang.Error,java.lang.RuntimeException,java.lang.NullPointerException,java.lang.ClassCastException,java.lang.ArrayIndexOutOfBoundsException" />
</inspection_tool>
- <inspection_tool class="SynchronizeOnNonFinalField" level="WARNING" enabled="false" />
- <inspection_tool class="UnnecessaryLabelOnBreakStatement" level="WARNING" enabled="false" />
- <inspection_tool class="ConstantConditionalExpression" level="WARNING" enabled="false" />
- <inspection_tool class="CssNoGenericFontName" level="WARNING" enabled="false" />
- <inspection_tool class="LoopStatementsThatDontLoop" level="WARNING" enabled="false" />
- <inspection_tool class="CheckImageSize" level="WARNING" enabled="false" />
- <inspection_tool class="UnresolvedPropertyKey" level="ERROR" enabled="false" />
- <inspection_tool class="CloneCallsSuperClone" level="WARNING" enabled="false" />
- <inspection_tool class="CloneDeclaresCloneNotSupported" level="WARNING" enabled="false" />
- <inspection_tool class="CheckEmptyScriptTag" level="WARNING" enabled="false" />
- <inspection_tool class="UnnecessaryContinue" level="WARNING" enabled="false" />
- <inspection_tool class="InstanceofChain" level="WARNING" enabled="true" />
- <inspection_tool class="InstanceofThis" level="WARNING" enabled="true" />
- <inspection_tool class="TypeMayBeWeakened" level="WARNING" enabled="true">
- <option name="useRighthandTypeAsWeakestTypeInAssignments" value="true" />
- <option name="useParameterizedTypeForCollectionMethods" value="true" />
+ <inspection_tool class="BadOddness" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="BigDecimalEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CStyleArrayDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CachedNumberConstructorCall" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CallToSimpleGetterInClass" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreGetterCallsOnOtherObjects" value="false" />
</inspection_tool>
- <inspection_tool class="ReplaceAssignmentWithOperatorAssignment" level="WARNING" enabled="true">
- <option name="ignoreLazyOperators" value="true" />
- <option name="ignoreObscureOperators" value="false" />
+ <inspection_tool class="CallToSimpleSetterInClass" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreSetterCallsOnOtherObjects" value="false" />
</inspection_tool>
- <inspection_tool class="AssignmentToForLoopParameter" level="WARNING" enabled="true">
- <option name="m_checkForeachParameters" value="false" />
+ <inspection_tool class="CallToStringConcatCanBeReplacedByOperator" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CastThatLosesPrecision" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreIntegerCharCasts" value="false" />
</inspection_tool>
- <inspection_tool class="AssignmentToNull" level="WARNING" enabled="true" />
- <inspection_tool class="AssignmentToCatchBlockParameter" level="WARNING" enabled="true" />
- <inspection_tool class="AssignmentToMethodParameter" level="WARNING" enabled="true">
- <option name="ignoreTransformationOfOriginalParameter" value="false" />
+ <inspection_tool class="CastToIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CatchGenericClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ChainedEquality" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ChannelResource" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CheckDtdRefs" enabled="false" level="ERROR" enabled_by_default="false" />
+ <inspection_tool class="CheckEmptyScriptTag" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CheckImageSize" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CheckValidXmlInScriptTagBody" enabled="false" level="ERROR" enabled_by_default="false" />
+ <inspection_tool class="ClassEscapesItsScope" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ClassInTopLevelPackage" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ClassNameDiffersFromFileName" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CloneCallsSuperClone" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CloneDeclaresCloneNotSupported" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CollectionAddedToSelf" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CollectionContainsUrl" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ComparableImplementedButEqualsNotOverridden" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ComparatorNotSerializable" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CompareToUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ComparisonToNaN" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ConditionalExpressionWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ConfusingElse" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ConfusingFloatingPointLiteral" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ConfusingOctalEscape" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ConstantConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ConstantIfStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ConstantMathCall" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CovariantCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CovariantEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="CssNoGenericFontName" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CssOverwrittenProperties" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CssUnitlessNumber" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="DefaultFileTemplate" enabled="false" level="WARNING" enabled_by_default="false">
+ <option name="CHECK_FILE_HEADER" value="true" />
+ <option name="CHECK_TRY_CATCH_SECTION" value="true" />
+ <option name="CHECK_METHOD_BODY" value="true" />
</inspection_tool>
- <inspection_tool class="AssignmentToStaticFieldFromInstanceMethod" level="WARNING" enabled="true" />
- <inspection_tool class="AssignmentUsedAsCondition" level="WARNING" enabled="true" />
- <inspection_tool class="NestedAssignment" level="WARNING" enabled="true" />
- <inspection_tool class="ClassComplexity" level="WARNING" enabled="true">
- <option name="m_limit" value="80" />
+ <inspection_tool class="DivideByZero" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="EmptyClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="EmptyInitializer" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreSwitchStatementsWithDefault" value="false" />
</inspection_tool>
- <inspection_tool class="ClassNameDiffersFromFileName" level="WARNING" enabled="true" />
- <inspection_tool class="ClassInTopLevelPackage" level="WARNING" enabled="true" />
- <inspection_tool class="EmptyClass" level="WARNING" enabled="true" />
- <inspection_tool class="FinalMethodInFinalClass" level="WARNING" enabled="true" />
- <inspection_tool class="MarkerInterface" level="WARNING" enabled="true" />
- <inspection_tool class="MissingDeprecatedAnnotation" level="WARNING" enabled="true" />
- <inspection_tool class="MissingOverrideAnnotation" level="WARNING" enabled="true" />
- <inspection_tool class="MultipleTopLevelClassesInFile" level="WARNING" enabled="true" />
- <inspection_tool class="NoopMethodInAbstractClass" level="WARNING" enabled="true" />
- <inspection_tool class="ProtectedMemberInFinalClass" level="WARNING" enabled="true" />
- <inspection_tool class="PublicConstructorInNonPublicClass" level="WARNING" enabled="true" />
- <inspection_tool class="Singleton" level="WARNING" enabled="true" />
- <inspection_tool class="UtilityClassWithPublicConstructor" level="WARNING" enabled="true" />
- <inspection_tool class="UtilityClassWithoutPrivateConstructor" level="WARNING" enabled="true">
- <option name="ignoreClassesWithOnlyMain" value="false" />
+ <inspection_tool class="EqualsAndHashcode" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="EqualsHashCodeCalledOnUrl" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="EqualsUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ErrorRethrown" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ExceptionFromCatchWhichDoesntWrap" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreGetMessage" value="false" />
</inspection_tool>
- <inspection_tool class="ThrowablePrintStackTrace" level="WARNING" enabled="true" />
- <inspection_tool class="ThreadDumpStack" level="WARNING" enabled="true" />
- <inspection_tool class="CStyleArrayDeclaration" level="WARNING" enabled="true" />
- <inspection_tool class="CallToStringConcatCanBeReplacedByOperator" level="WARNING" enabled="true" />
- <inspection_tool class="ChainedEquality" level="WARNING" enabled="true" />
- <inspection_tool class="ChainedMethodCall" level="WARNING" enabled="true">
- <option name="m_ignoreFieldInitializations" value="true" />
+ <inspection_tool class="ExtendsConcreteCollection" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ExtendsUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="FieldHidesSuperclassField" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_ignoreInvisibleFields" value="true" />
</inspection_tool>
- <inspection_tool class="ConfusingOctalEscape" level="WARNING" enabled="true" />
- <inspection_tool class="ControlFlowStatementWithoutBraces" level="WARNING" enabled="true" />
- <inspection_tool class="ListIndexOfReplaceableByContains" level="WARNING" enabled="true" />
- <inspection_tool class="LocalCanBeFinal" level="WARNING" enabled="true">
- <option name="REPORT_VARIABLES" value="true" />
- <option name="REPORT_PARAMETERS" value="true" />
+ <inspection_tool class="FieldMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="FinalMethodInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="Finalize" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreTrivialFinalizers" value="true" />
</inspection_tool>
- <inspection_tool class="MissortedModifiers" level="WARNING" enabled="true">
- <option name="m_requireAnnotationsFirst" value="true" />
+ <inspection_tool class="FinalizeNotProtected" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="FloatingPointEquality" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ForLoopThatDoesntUseLoopVariable" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="HashCodeUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="IOResource" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoredTypesString" value="java.io.ByteArrayOutputStream,java.io.ByteArrayInputStream,java.io.StringBufferInputStream,java.io.CharArrayWriter,java.io.CharArrayReader,java.io.StringWriter,java.io.StringReader" />
</inspection_tool>
- <inspection_tool class="MultipleDeclaration" level="WARNING" enabled="true" />
- <inspection_tool class="RedundantImplements" level="WARNING" enabled="true" />
- <inspection_tool class="ReturnThis" level="WARNING" enabled="true" />
- <inspection_tool class="UnnecessarilyQualifiedStaticUsage" level="WARNING" enabled="true">
- <option name="m_ignoreStaticFieldAccesses" value="false" />
- <option name="m_ignoreStaticMethodCalls" value="false" />
- <option name="m_ignoreStaticAccessFromStaticContext" value="false" />
+ <inspection_tool class="IfStatementWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ImplicitNumericConversion" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreWideningConversions" value="false" />
+ <option name="ignoreCharConversions" value="false" />
+ <option name="ignoreConstantConversions" value="false" />
</inspection_tool>
- <inspection_tool class="UnnecessaryThis" level="WARNING" enabled="true" />
- <inspection_tool class="UnnecessarySuperConstructor" level="WARNING" enabled="true" />
- <inspection_tool class="UnnecessaryBlockStatement" level="WARNING" enabled="true" />
- <inspection_tool class="UnnecessaryEnumModifier" level="WARNING" enabled="true" />
- <inspection_tool class="UnnecessaryFullyQualifiedName" level="WARNING" enabled="true">
- <option name="m_ignoreJavadoc" value="false" />
+ <inspection_tool class="InconsistentResourceBundle" enabled="false" level="ERROR" enabled_by_default="false">
+ <option name="REPORT_MISSING_TRANSLATIONS" value="true" />
+ <option name="REPORT_INCONSISTENT_PROPERTIES" value="true" />
+ <option name="REPORT_DUPLICATED_PROPERTIES" value="true" />
</inspection_tool>
- <inspection_tool class="UnnecessaryInterfaceModifier" level="WARNING" enabled="true" />
- <inspection_tool class="UnnecessaryParentheses" level="WARNING" enabled="true">
- <option name="ignoreClarifyingParentheses" value="false" />
- <option name="ignoreParenthesesOnConditionals" value="false" />
+ <inspection_tool class="IndexOfReplaceableByContains" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InfiniteLoopStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="InnerClassMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InnerClassVariableHidesOuterClassVariable" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_ignoreInvisibleFields" value="true" />
</inspection_tool>
- <inspection_tool class="UnnecessaryQualifierForThis" level="WARNING" enabled="true" />
- <inspection_tool class="MultipleTypedDeclaration" level="WARNING" enabled="true" />
- <inspection_tool class="ConditionalExpressionWithIdenticalBranches" level="WARNING" enabled="true" />
- <inspection_tool class="ConfusingElse" level="WARNING" enabled="true" />
- <inspection_tool class="EnumSwitchStatementWhichMissesCases" level="WARNING" enabled="true">
- <option name="ignoreSwitchStatementsWithDefault" value="false" />
+ <inspection_tool class="InstanceVariableInitialization" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_ignorePrimitives" value="false" />
</inspection_tool>
- <inspection_tool class="ForLoopReplaceableByWhile" level="WARNING" enabled="true">
- <option name="m_ignoreLoopsWithoutConditions" value="false" />
+ <inspection_tool class="InstanceVariableUninitializedUse" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_ignorePrimitives" value="false" />
</inspection_tool>
- <inspection_tool class="IfStatementWithIdenticalBranches" level="WARNING" enabled="true" />
- <inspection_tool class="SwitchStatementWithConfusingDeclaration" level="WARNING" enabled="true" />
- <inspection_tool class="PointlessIndexOfComparison" level="WARNING" enabled="true" />
- <inspection_tool class="LawOfDemeter" level="WARNING" enabled="true">
- <option name="ignoreLibraryCalls" value="true" />
+ <inspection_tool class="InstanceofCatchParameter" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InstanceofChain" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InstanceofIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InstantiationOfUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="IntegerDivisionInFloatingPointContext" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="IntegerMultiplicationImplicitCastToLong" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="InterfaceNeverImplemented" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreInterfacesThatOnlyDeclareConstants" value="false" />
</inspection_tool>
- <inspection_tool class="ReuseOfLocalVariable" level="WARNING" enabled="true" />
- <inspection_tool class="TooBroadScope" level="WARNING" enabled="true">
- <option name="m_allowConstructorAsInitializer" value="false" />
- <option name="m_onlyLookAtBlocks" value="false" />
+ <inspection_tool class="IteratorHasNextCallsIteratorNext" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="IteratorNextDoesNotThrowNoSuchElementException" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="TOP_LEVEL_CLASS_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="package" />
+ <option name="REQUIRED_TAGS" value="@author" />
+ </value>
+ </option>
+ <option name="INNER_CLASS_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="private" />
+ <option name="REQUIRED_TAGS" value="" />
+ </value>
+ </option>
+ <option name="METHOD_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="private" />
+ <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+ </value>
+ </option>
+ <option name="FIELD_OPTIONS">
+ <value>
+ <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="private" />
+ <option name="REQUIRED_TAGS" value="" />
+ </value>
+ </option>
+ <option name="IGNORE_DEPRECATED" value="true" />
+ <option name="IGNORE_JAVADOC_PERIOD" value="false" />
+ <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+ <option name="myAdditionalJavadocTags" value="fixme invariant note todo val warning" />
</inspection_tool>
- <inspection_tool class="RedundantSuppression" level="WARNING" enabled="true" />
- <inspection_tool class="RedundantThrowsDeclaration" level="WARNING" enabled="true" />
- <inspection_tool class="UnusedLibrary" level="WARNING" enabled="true" />
- <inspection_tool class="PackageVisibleField" level="WARNING" enabled="true" />
- <inspection_tool class="PackageVisibleInnerClass" level="WARNING" enabled="true" />
- <inspection_tool class="ProtectedField" level="WARNING" enabled="true" />
- <inspection_tool class="ProtectedInnerClass" level="WARNING" enabled="true" />
- <inspection_tool class="PublicField" level="WARNING" enabled="true">
- <option name="ignoreEnums" value="false" />
+ <inspection_tool class="JavaLangImport" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ListIndexOfReplaceableByContains" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="REPORT_VARIABLES" value="true" />
+ <option name="REPORT_PARAMETERS" value="true" />
</inspection_tool>
- <inspection_tool class="PublicInnerClass" level="WARNING" enabled="true">
- <option name="ignoreEnums" value="false" />
+ <inspection_tool class="LocalVariableHidingMemberVariable" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_ignoreInvisibleFields" value="true" />
+ <option name="m_ignoreStaticMethods" value="true" />
</inspection_tool>
- <inspection_tool class="CatchGenericClass" level="WARNING" enabled="true" />
- <inspection_tool class="InstanceofCatchParameter" level="WARNING" enabled="true" />
- <inspection_tool class="ErrorRethrown" level="WARNING" enabled="true" />
- <inspection_tool class="ThreadDeathRethrown" level="WARNING" enabled="true" />
- <inspection_tool class="NonFinalFieldOfException" level="WARNING" enabled="true" />
- <inspection_tool class="TooBroadCatch" level="WARNING" enabled="true">
- <option name="onlyWarnOnRootExceptions" value="false" />
+ <inspection_tool class="LongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="LoopStatementsThatDontLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="MapReplaceableByEnumMap" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MarkerInterface" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MethodMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_onlyPrivateOrFinal" value="false" />
+ <option name="m_ignoreEmptyMethods" value="true" />
</inspection_tool>
- <inspection_tool class="BadExceptionCaught" level="WARNING" enabled="true">
- <option name="exceptionsString" value="java.lang.NullPointerException,java.lang.IllegalMonitorStateException,java.lang.ArrayIndexOutOfBoundsException" />
+ <inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MethodOverridesPackageLocalMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MethodOverridesPrivateMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MethodOverridesStaticMethod" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MissingDeprecatedAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_requireAnnotationsFirst" value="true" />
</inspection_tool>
- <inspection_tool class="BadExceptionDeclared" level="WARNING" enabled="true">
- <option name="exceptionsString" value="java.lang.Throwable,java.lang.Exception,java.lang.Error,java.lang.RuntimeException,java.lang.NullPointerException,java.lang.ClassCastException,java.lang.ArrayIndexOutOfBoundsException" />
- <option name="ignoreTestCases" value="false" />
- </inspection_tool>
- <inspection_tool class="BadExceptionThrown" level="WARNING" enabled="true">
- <option name="exceptionsString" value="java.lang.Throwable,java.lang.Exception,java.lang.Error,java.lang.RuntimeException,java.lang.NullPointerException,java.lang.ClassCastException,java.lang.ArrayIndexOutOfBoundsException" />
- </inspection_tool>
- <inspection_tool class="ExceptionFromCatchWhichDoesntWrap" level="WARNING" enabled="true">
- <option name="ignoreGetMessage" value="false" />
- </inspection_tool>
- <inspection_tool class="UncheckedExceptionClass" level="WARNING" enabled="true" />
- <inspection_tool class="UnusedCatchParameter" level="WARNING" enabled="true">
- <option name="m_ignoreCatchBlocksWithComments" value="false" />
- <option name="m_ignoreTestCases" value="false" />
- </inspection_tool>
- <inspection_tool class="Finalize" level="WARNING" enabled="true" />
- <inspection_tool class="FinalizeNotProtected" level="WARNING" enabled="true" />
- <inspection_tool class="EqualsAndHashcode" level="WARNING" enabled="true" />
- <inspection_tool class="OnDemandImport" level="WARNING" enabled="true" />
- <inspection_tool class="SamePackageImport" level="WARNING" enabled="true" />
- <inspection_tool class="JavaLangImport" level="WARNING" enabled="true" />
- <inspection_tool class="RedundantImport" level="WARNING" enabled="true" />
- <inspection_tool class="StaticImport" level="WARNING" enabled="true" />
- <inspection_tool class="UnusedImport" level="WARNING" enabled="true" />
- <inspection_tool class="AbstractClassExtendsConcreteClass" level="WARNING" enabled="true" />
- <inspection_tool class="AbstractClassNeverImplemented" level="WARNING" enabled="true" />
- <inspection_tool class="AbstractClassWithoutAbstractMethods" level="WARNING" enabled="true" />
- <inspection_tool class="AbstractMethodOverridesAbstractMethod" level="WARNING" enabled="true" />
- <inspection_tool class="AbstractMethodOverridesConcreteMethod" level="WARNING" enabled="true" />
- <inspection_tool class="AbstractMethodWithMissingImplementations" level="WARNING" enabled="true" />
- <inspection_tool class="ExtendsConcreteCollection" level="WARNING" enabled="true" />
- <inspection_tool class="ExtendsUtilityClass" level="WARNING" enabled="true" />
- <inspection_tool class="NonProtectedConstructorInAbstractClass" level="WARNING" enabled="true">
+ <inspection_tool class="MisspelledCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MisspelledEquals" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MisspelledHashcode" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MisspelledToString" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MultipleDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MultipleTopLevelClassesInFile" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="MultipleTypedDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NestedAssignment" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NonFinalFieldOfException" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NonFinalStaticVariableUsedInClassInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NonProtectedConstructorInAbstractClass" enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_ignoreNonPublicClasses" value="false" />
</inspection_tool>
- <inspection_tool class="InterfaceNeverImplemented" level="WARNING" enabled="true">
- <option name="ignoreInterfacesThatOnlyDeclareConstants" value="false" />
+ <inspection_tool class="NonReproducibleMathCall" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NonSerializableFieldInSerializableClass" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="superClassString" value="java.awt.Component" />
</inspection_tool>
- <inspection_tool class="RedundantMethodOverride" level="WARNING" enabled="true" />
- <inspection_tool class="RefusedBequest" level="WARNING" enabled="true">
- <option name="ignoreEmptySuperMethods" value="false" />
+ <inspection_tool class="NonSerializableObjectPassedToObjectStream" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NonSerializableWithSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NonShortCircuitBoolean" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NonThreadSafeLazyInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="NoopMethodInAbstractClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ObjectToString" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="OctalAndDecimalIntegersMixed" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="OnDemandImport" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="OverridableMethodCallDuringObjectConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="OverriddenMethodCallDuringObjectConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="PackageVisibleField" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="PackageVisibleInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreEnums" value="false" />
</inspection_tool>
- <inspection_tool class="StaticInheritance" level="WARNING" enabled="true" />
- <inspection_tool class="TypeParameterExtendsFinalClass" level="WARNING" enabled="true" />
- <inspection_tool class="AbstractMethodCallInConstructor" level="WARNING" enabled="true" />
- <inspection_tool class="InstanceVariableInitialization" level="WARNING" enabled="true">
- <option name="m_ignorePrimitives" value="false" />
+ <inspection_tool class="PointlessBitwiseExpression" enabled="false" level="WARNING" enabled_by_default="false">
+ <option name="m_ignoreExpressionsContainingConstants" value="false" />
</inspection_tool>
- <inspection_tool class="InstanceVariableUninitializedUse" level="WARNING" enabled="true">
- <option name="m_ignorePrimitives" value="false" />
+ <inspection_tool class="PointlessIndexOfComparison" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ProtectedField" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ProtectedInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreEnums" value="false" />
</inspection_tool>
- <inspection_tool class="NonFinalStaticVariableUsedInClassInitialization" level="WARNING" enabled="true" />
- <inspection_tool class="OverridableMethodCallDuringObjectConstruction" level="WARNING" enabled="true" />
- <inspection_tool class="OverriddenMethodCallDuringObjectConstruction" level="WARNING" enabled="true" />
- <inspection_tool class="StaticVariableInitialization" level="WARNING" enabled="true">
- <option name="m_ignorePrimitives" value="false" />
+ <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="PublicConstructorInNonPublicClass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="PublicField" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreEnums" value="false" />
</inspection_tool>
- <inspection_tool class="StaticVariableUninitializedUse" level="WARNING" enabled="true">
- <option name="m_ignorePrimitives" value="false" />
+ <inspection_tool class="PublicInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreEnums" value="false" />
</inspection_tool>
- <inspection_tool class="ThisEscapedInConstructor" level="WARNING" enabled="true" />
- <inspection_tool class="NonThreadSafeLazyInitialization" level="WARNING" enabled="true" />
- <inspection_tool class="IndexOfReplaceableByContains" level="WARNING" enabled="true" />
- <inspection_tool class="RawUseOfParameterizedType" level="WARNING" enabled="true">
+ <inspection_tool class="RandomDoubleForRandomInteger" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="RawUseOfParameterizedType" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreObjectConstruction" value="true" />
<option name="ignoreTypeCasts" value="false" />
</inspection_tool>
- <inspection_tool class="ZeroLengthArrayInitialization" level="WARNING" enabled="true" />
- <inspection_tool class="ComparisonOfShortAndChar" level="WARNING" enabled="true" />
- <inspection_tool class="ComparisonToNaN" level="WARNING" enabled="true" />
- <inspection_tool class="ConfusingFloatingPointLiteral" level="WARNING" enabled="true" />
- <inspection_tool class="ConstantMathCall" level="WARNING" enabled="true" />
- <inspection_tool class="DivideByZero" level="WARNING" enabled="true" />
- <inspection_tool class="BigDecimalEquals" level="WARNING" enabled="true" />
- <inspection_tool class="FloatingPointEquality" level="WARNING" enabled="true" />
- <inspection_tool class="ImplicitNumericConversion" level="WARNING" enabled="true">
- <option name="ignoreWideningConversions" value="false" />
- <option name="ignoreCharConversions" value="false" />
+ <inspection_tool class="RedundantImplements" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreSerializable" value="false" />
+ <option name="ignoreCloneable" value="false" />
</inspection_tool>
- <inspection_tool class="IntegerDivisionInFloatingPointContext" level="WARNING" enabled="true" />
- <inspection_tool class="IntegerMultiplicationImplicitCastToLong" level="WARNING" enabled="true" />
- <inspection_tool class="LongLiteralsEndingWithLowercaseL" level="WARNING" enabled="true" />
- <inspection_tool class="NonReproducibleMathCall" level="WARNING" enabled="true" />
- <inspection_tool class="CachedNumberConstructorCall" level="WARNING" enabled="true" />
- <inspection_tool class="CastThatLosesPrecision" level="WARNING" enabled="true">
- <option name="ignoreIntegerCharCasts" value="false" />
+ <inspection_tool class="RedundantImport" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="RedundantMethodOverride" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="RedundantSuppression" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="RedundantThrowsDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="RefusedBequest" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreEmptySuperMethods" value="false" />
</inspection_tool>
- <inspection_tool class="OctalAndDecimalIntegersMixed" level="WARNING" enabled="true" />
- <inspection_tool class="OverlyComplexArithmeticExpression" level="WARNING" enabled="true">
- <option name="m_limit" value="6" />
+ <inspection_tool class="ReplaceAllDot" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ReplaceAssignmentWithOperatorAssignment" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="ignoreLazyOperators" value="true" />
+ <option name="ignoreObscureOperators" value="false" />
</inspection_tool>
- <inspection_tool class="BadOddness" level="WARNING" enabled="true" />
- <inspection_tool class="UnaryPlus" level="WARNING" enabled="true" />
- <inspection_tool class="UnnecessaryUnaryMinus" level="WARNING" enabled="true" />
- <inspection_tool class="UnpredictableBigDecimalConstructorCall" level="WARNING" enabled="true" />
- <inspection_tool class="CallToSimpleGetterInClass" level="WARNING" enabled="true">
- <option name="ignoreGetterCallsOnOtherObjects" value="false" />
+ <inspection_tool class="RequiredAttributes" enabled="false" level="WARNING" enabled_by_default="false">
+ <option name="myAdditionalRequiredHtmlAttributes" value="" />
</inspection_tool>
- <inspection_tool class="CallToSimpleSetterInClass" level="WARNING" enabled="true">
- <option name="ignoreSetterCallsOnOtherObjects" value="false" />
+ <inspection_tool class="ResultOfObjectAllocationIgnored" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ResultSetIndexZero" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="ReturnNull" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_reportObjectMethods" value="true" />
+ <option name="m_reportArrayMethods" value="true" />
+ <option name="m_reportCollectionMethods" value="true" />
</inspection_tool>
- <inspection_tool class="TrivialStringConcatenation" level="WARNING" enabled="true" />
- <inspection_tool class="StringBufferReplaceableByString" level="WARNING" enabled="true" />
- <inspection_tool class="EqualsHashCodeCalledOnUrl" level="WARNING" enabled="true" />
- <inspection_tool class="FieldMayBeStatic" level="WARNING" enabled="true" />
- <inspection_tool class="InnerClassMayBeStatic" level="WARNING" enabled="true" />
- <inspection_tool class="CollectionContainsUrl" level="WARNING" enabled="true" />
- <inspection_tool class="MapReplaceableByEnumMap" level="WARNING" enabled="true" />
- <inspection_tool class="MethodMayBeStatic" level="WARNING" enabled="true">
- <option name="m_onlyPrivateOrFinal" value="false" />
- <option name="m_ignoreEmptyMethods" value="true" />
+ <inspection_tool class="ReuseOfLocalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="SamePackageImport" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="SerialPersistentFieldsWithWrongSignature" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="SerialVersionUIDNotStaticFinal" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="superClassString" value="java.awt.Component" />
</inspection_tool>
- <inspection_tool class="StringReplaceableByStringBuffer" level="WARNING" enabled="true">
- <option name="onlyWarnOnLoop" value="true" />
+ <inspection_tool class="SerializableInnerClassHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="superClassString" value="java.awt.Component" />
</inspection_tool>
- <inspection_tool class="SubstringZero" level="WARNING" enabled="true" />
- <inspection_tool class="SetReplaceableByEnumSet" level="WARNING" enabled="true" />
- <inspection_tool class="LengthOneStringInIndexOf" level="WARNING" enabled="true" />
- <inspection_tool class="SizeReplaceableByIsEmpty" level="WARNING" enabled="true">
+ <inspection_tool class="SetReplaceableByEnumSet" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="SimplifiableConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="SimplifiableIfStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="Singleton" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="SizeReplaceableByIsEmpty" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreNegations" value="false" />
</inspection_tool>
- <inspection_tool class="StringEqualsEmptyString" level="WARNING" enabled="true" />
- <inspection_tool class="StringBufferReplaceableByStringBuilder" level="WARNING" enabled="true" />
- <inspection_tool class="StringBufferToStringInConcatenation" level="WARNING" enabled="true" />
- <inspection_tool class="RandomDoubleForRandomInteger" level="WARNING" enabled="true" />
- <inspection_tool class="ObjectToString" level="WARNING" enabled="true" />
- <inspection_tool class="ReplaceAllDot" level="WARNING" enabled="true" />
- <inspection_tool class="CastConflictsWithInstanceof" level="WARNING" enabled="true" />
- <inspection_tool class="CastToIncompatibleInterface" level="WARNING" enabled="true" />
- <inspection_tool class="CollectionAddedToSelf" level="WARNING" enabled="true" />
- <inspection_tool class="ComparableImplementedButEqualsNotOverridden" level="WARNING" enabled="true" />
- <inspection_tool class="MisspelledCompareTo" level="WARNING" enabled="true" />
- <inspection_tool class="CovariantCompareTo" level="WARNING" enabled="true" />
- <inspection_tool class="CovariantEquals" level="WARNING" enabled="true" />
- <inspection_tool class="EmptyInitializer" level="WARNING" enabled="true" />
- <inspection_tool class="MisspelledEquals" level="WARNING" enabled="true" />
- <inspection_tool class="ForLoopThatDoesntUseLoopVariable" level="WARNING" enabled="true" />
- <inspection_tool class="MisspelledHashcode" level="WARNING" enabled="true" />
- <inspection_tool class="InstanceofIncompatibleInterface" level="WARNING" enabled="true" />
- <inspection_tool class="InstantiationOfUtilityClass" level="WARNING" enabled="true" />
- <inspection_tool class="IteratorHasNextCallsIteratorNext" level="WARNING" enabled="true" />
- <inspection_tool class="IteratorNextDoesNotThrowNoSuchElementException" level="WARNING" enabled="true" />
- <inspection_tool class="CompareToUsesNonFinalVariable" level="WARNING" enabled="true" />
- <inspection_tool class="EqualsUsesNonFinalVariable" level="WARNING" enabled="true" />
- <inspection_tool class="HashCodeUsesNonFinalVariable" level="WARNING" enabled="true" />
- <inspection_tool class="NonShortCircuitBoolean" level="WARNING" enabled="true" />
- <inspection_tool class="ObjectEquality" level="WARNING" enabled="true">
- <option name="m_ignoreEnums" value="true" />
- <option name="m_ignoreClassObjects" value="false" />
- <option name="m_ignorePrivateConstructors" value="false" />
+ <inspection_tool class="SocketResource" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="SpellCheckingInspection" enabled="true" level="INFO" enabled_by_default="true">
+ <option name="processCode" value="true" />
+ <option name="processLiterals" value="true" />
+ <option name="processComments" value="true" />
</inspection_tool>
- <inspection_tool class="ResultOfObjectAllocationIgnored" level="WARNING" enabled="true" />
- <inspection_tool class="ReturnNull" level="WARNING" enabled="true">
- <option name="m_reportObjectMethods" value="true" />
- <option name="m_reportArrayMethods" value="true" />
- <option name="m_reportCollectionMethods" value="true" />
+ <inspection_tool class="StaticCallOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="StaticFieldReferenceOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="StaticImport" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="StaticInheritance" enabled="true" level="WARNING" enabled_by_default="true" />
+ <inspection_tool class="StaticVariableInitialization" enabled="true" level="WARNING" enabled_by_default="true">
+ <option name="m_ignorePrimitives" value="false" />
</inspection_tool>
- <inspection_tool class="StaticFieldReferenceOnSubclass" level="WARNING" enabled="true" />
- <inspection_tool class="StaticCallOnSubclass" level="WARNING" enabled="true" />
- <inspection_tool class="SubtractionInCompareTo" level="WARNING" enabled="true" />
- <inspection_tool class="SuspiciousIndentAfterControlStatement" level="WARNING" enabled="true" />
- <inspection_tool class="TextLabelInSwitchStatement" level="WARNING" enabled="true" />
- <inspection_tool class="MisspelledToString" level="WARNING" enabled="true" />
- <inspection_tool class="ArchaicSystemPropertyAccess" level="WARNING" enabled="true" />
- <inspection_tool class="ResultSetIndexZero" level="WARNING" enabled="true" />
- <inspection_tool class="UseOfPropertiesAsHashtable" level="WARNING" enabled="true" />
- <inspection_tool class="ChannelResource" level="WARNING" enabled="true" />
- <inspection_tool class="IOR...
[truncated message content] |
|
From: <aki...@us...> - 2010-05-22 13:57:59
|
Revision: 7858
http://gridarta.svn.sourceforge.net/gridarta/?rev=7858&view=rev
Author: akirschbaum
Date: 2010-05-22 13:57:53 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Add comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:55:08 UTC (rev 7857)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:57:53 UTC (rev 7858)
@@ -33,6 +33,10 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+/**
+ * Creates and displays the replace dialog.
+ * @author Andreas Kirschbaum
+ */
public class ReplaceDialogManager<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
/**
@@ -53,6 +57,9 @@
@NotNull
private final CopyBuffer<G, A, R> copyBuffer;
+ /**
+ * The {@link ObjectChooser} to use.
+ */
@NotNull
private final ObjectChooser<G, A, R> objectChooser;
@@ -96,7 +103,10 @@
/**
* Creates a new instance.
+ * @param parent the parent component for dialogs
* @param copyBuffer the copy buffer's
+ * @param objectChooser the object chooser to use
+ * @param mapViewManager the map view manager to use
* @param faceObjectProviders the face object providers for looking up
* faces
* @param insertionModeSet the insertion mode set to use
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:55:20
|
Revision: 7857
http://gridarta.svn.sourceforge.net/gridarta/?rev=7857&view=rev
Author: akirschbaum
Date: 2010-05-22 13:55:08 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Add @NotNull annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:54:33 UTC (rev 7856)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:55:08 UTC (rev 7857)
@@ -71,6 +71,7 @@
/**
* The map view manager listener to detect closed map views.
*/
+ @NotNull
private final MapViewManagerListener<G, A, R> mapViewManagerListener = new MapViewManagerListener<G, A, R>() {
/** {@inheritDoc} */
@@ -114,7 +115,7 @@
* @param mapView the map view to dispose the dialog of; do nothing if no
* dialog exists
*/
- private void disposeDialog(final MapView<G, A, R> mapView) {
+ private void disposeDialog(@NotNull final MapView<G, A, R> mapView) {
if (instance != null) {
instance.dispose(mapView);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:54:39
|
Revision: 7856
http://gridarta.svn.sourceforge.net/gridarta/?rev=7856&view=rev
Author: akirschbaum
Date: 2010-05-22 13:54:33 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Remove ReplaceDialogManager.getInstance().
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:52:04 UTC (rev 7855)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:54:33 UTC (rev 7856)
@@ -109,14 +109,6 @@
mapViewManager.addMapViewManagerListener(mapViewManagerListener);
}
- @NotNull
- public ReplaceDialog<G, A, R> getInstance() {
- if (instance == null) {
- instance = new ReplaceDialog<G, A, R>(parent, copyBuffer, objectChooser, faceObjectProviders, insertionModeSet);
- }
- return instance;
- }
-
/**
* Dispose the replace dialog.
* @param mapView the map view to dispose the dialog of; do nothing if no
@@ -128,4 +120,15 @@
}
}
+ /**
+ * Displays the replace dialog.
+ * @param mapView the map view to operate on
+ */
+ public void showDialog(@NotNull final MapView<G, A, R> mapView) {
+ if (instance == null) {
+ instance = new ReplaceDialog<G, A, R>(parent, copyBuffer, objectChooser, faceObjectProviders, insertionModeSet);
+ }
+ instance.display(mapView);
+ }
+
} // class ReplaceDialogManager
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-22 13:52:04 UTC (rev 7855)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-22 13:54:33 UTC (rev 7856)
@@ -770,7 +770,7 @@
public void replace() {
final MapView<G, A, R> mapView = getReplaceEnabled();
if (mapView != null) {
- replaceDialogManager.getInstance().display(mapView);
+ replaceDialogManager.showDialog(mapView);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:52:10
|
Revision: 7855
http://gridarta.svn.sourceforge.net/gridarta/?rev=7855&view=rev
Author: akirschbaum
Date: 2010-05-22 13:52:04 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Remove unused code.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:51:15 UTC (rev 7854)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:52:04 UTC (rev 7855)
@@ -109,15 +109,6 @@
mapViewManager.addMapViewManagerListener(mapViewManagerListener);
}
- /**
- * Returns whether this frame has been fully built.
- * @return <code>true</code> if this frame has been fully built, otherwise
- * <code>false</code>
- */
- public boolean isBuilt() {
- return instance != null && instance.isBuilt();
- }
-
@NotNull
public ReplaceDialog<G, A, R> getInstance() {
if (instance == null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:51:21
|
Revision: 7854
http://gridarta.svn.sourceforge.net/gridarta/?rev=7854&view=rev
Author: akirschbaum
Date: 2010-05-22 13:51:15 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Encapsulate copy buffer's map model into CopyBuffer.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:48:14 UTC (rev 7853)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:51:15 UTC (rev 7854)
@@ -30,6 +30,8 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
+import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapModelListener;
@@ -76,13 +78,16 @@
/**
* Create the copy buffer.
* @param mapViewSettings the map view settings instance
- * @param mapModel the underlying map model
* @param gameObjectFactory the game object factory to use
+ * @param mapArchObjectFactory the map arch object factory to use
+ * @param mapControlFactory the map control factory to use
* @param insertionModeSet the insertion mode set to use
*/
- public CopyBuffer(@NotNull final MapViewSettings mapViewSettings, @NotNull final MapModel<G, A, R> mapModel, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
+ public CopyBuffer(@NotNull final MapViewSettings mapViewSettings, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
this.mapViewSettings = mapViewSettings;
- this.mapModel = mapModel;
+ final A mapArchObject = mapArchObjectFactory.newMapArchObject(false);
+ mapArchObject.setMapName("cb");
+ mapModel = mapControlFactory.newMapModel(mapArchObject);
this.gameObjectFactory = gameObjectFactory;
this.insertionModeSet = insertionModeSet;
}
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:48:14 UTC (rev 7853)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:51:15 UTC (rev 7854)
@@ -421,11 +421,8 @@
final SelectedSquareModel<G, A, R> selectedSquareModel = new SelectedSquareModel<G, A, R>();
final SelectedSquareActions<G, A, R> selectedSquareActions = new SelectedSquareActions<G, A, R>(selectedSquareModel);
final SelectedSquareControl<G, A, R> selectedSquareControl = new SelectedSquareControl<G, A, R>(selectedSquareModel, selectedSquareActions, gameObjectAttributesDialogFactory, objectChooser, mapManager, mapViewManager, mapViewSettings, compassIcon, faceObjectProviders, systemIcons.getUnknownSquareIcon());
- final A mapArchObject = mapArchObjectFactory.newMapArchObject(false);
- mapArchObject.setMapName("cb");
- final MapModel<G, A, R> copyBufferMapModel = mapControlFactory.newMapModel(mapArchObject);
final InsertionModeSet<G, A, R> insertionModeSet = new InsertionModeSet<G, A, R>(topmostInsertionMode);
- final CopyBuffer<G, A, R> copyBuffer = new CopyBuffer<G, A, R>(mapViewSettings, copyBufferMapModel, gameObjectFactory, insertionModeSet);
+ final CopyBuffer<G, A, R> copyBuffer = new CopyBuffer<G, A, R>(mapViewSettings, gameObjectFactory, mapArchObjectFactory, mapControlFactory, insertionModeSet);
final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(mainViewFrame, copyBuffer, objectChooser, mapViewManager, faceObjectProviders, insertionModeSet);
new About(mainViewFrame);
exiter = new DefaultExiter(mainViewFrame);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:48:21
|
Revision: 7853
http://gridarta.svn.sourceforge.net/gridarta/?rev=7853&view=rev
Author: akirschbaum
Date: 2010-05-22 13:48:14 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Remove direct accesses to the copy buffer's internal map model.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -23,6 +23,7 @@
import java.awt.Rectangle;
import java.util.Collection;
import java.util.HashSet;
+import java.util.List;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
@@ -237,4 +238,14 @@
return true;
}
+ /**
+ * Return all game objects. Only top-level head parts are returned; tail
+ * parts are ignored as are objects in inventories.
+ * @return all game objects
+ */
+ @NotNull
+ public List<G> getAllGameObjects() {
+ return mapModel.getAllGameObjects();
+ }
+
} // class CopyBuffer
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -43,6 +43,7 @@
import javax.swing.JTextField;
import javax.swing.WindowConstants;
import javax.swing.text.JTextComponent;
+import net.sf.gridarta.gui.copybuffer.CopyBuffer;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.objectchooser.ObjectChooserListener;
@@ -129,10 +130,10 @@
private final Component parent;
/**
- * The copy buffer's {@link MapModel}.
+ * The {@link CopyBuffer}.
*/
@NotNull
- private final MapModel<G, A, R> copyBufferMapModel;
+ private final CopyBuffer<G, A, R> copyBuffer;
/**
* The object chooser to use.
@@ -224,19 +225,19 @@
/**
* Creates a new instance.
* @param parent the parent component for dialogs
- * @param copyBufferMapModel the copy buffer's map model
+ * @param copyBuffer the copy buffer's
* @param objectChooser the object chooser to use
* @param faceObjectProviders the face object providers for looking up
* faces
* @param insertionModeSet the insertion mode set to use
*/
- public ReplaceDialog(@NotNull final Component parent, @NotNull final MapModel<G, A, R> copyBufferMapModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
+ public ReplaceDialog(@NotNull final Component parent, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
this.insertionModeSet = insertionModeSet;
dialog = createDialog(parent, ACTION_BUILDER.getString("replaceTitle"));
dialog.setModal(false);
dialog.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
this.parent = parent;
- this.copyBufferMapModel = copyBufferMapModel;
+ this.copyBuffer = copyBuffer;
this.objectChooser = objectChooser;
this.faceObjectProviders = faceObjectProviders;
objectChooser.addObjectChooserListener(objectChooserListener);
@@ -249,7 +250,7 @@
public void display(@NotNull final MapView<G, A, R> mapView) {
replaceArch = objectChooser.getCursorSelection(); // highlighted arch
replacePickmap = objectChooser.getSelections(); // selected arches
- replaceCopyBuffer = copyBufferMapModel.getAllGameObjects();
+ replaceCopyBuffer = copyBuffer.getAllGameObjects();
if (isBuilt) {
// just set fields and show
@@ -540,7 +541,7 @@
break;
case REPLACE_WITH_COPY_BUFFER:
- replaceCopyBuffer = copyBufferMapModel.getAllGameObjects();
+ replaceCopyBuffer = copyBuffer.getAllGameObjects();
iconLabel.setIcon(null);
size = replaceCopyBuffer.size();
rfArchName.setText(String.valueOf(size));
Modified: trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -20,6 +20,7 @@
package net.sf.gridarta.gui.replacedialog;
import java.awt.Component;
+import net.sf.gridarta.gui.copybuffer.CopyBuffer;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
import net.sf.gridarta.gui.map.mapview.MapViewManagerListener;
@@ -29,7 +30,6 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -48,10 +48,10 @@
private final Component parent;
/**
- * The copy buffer's {@link MapModel}.
+ * The {@link CopyBuffer}.
*/
@NotNull
- private final MapModel<G, A, R> copyBufferMapModel;
+ private final CopyBuffer<G, A, R> copyBuffer;
@NotNull
private final ObjectChooser<G, A, R> objectChooser;
@@ -95,14 +95,14 @@
/**
* Creates a new instance.
- * @param copyBufferMapModel the copy buffer's map model
+ * @param copyBuffer the copy buffer's
* @param faceObjectProviders the face object providers for looking up
* faces
* @param insertionModeSet the insertion mode set to use
*/
- public ReplaceDialogManager(@NotNull final Component parent, @NotNull final MapModel<G, A, R> copyBufferMapModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
+ public ReplaceDialogManager(@NotNull final Component parent, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final InsertionModeSet<G, A, R> insertionModeSet) {
this.parent = parent;
- this.copyBufferMapModel = copyBufferMapModel;
+ this.copyBuffer = copyBuffer;
this.objectChooser = objectChooser;
this.faceObjectProviders = faceObjectProviders;
this.insertionModeSet = insertionModeSet;
@@ -121,7 +121,7 @@
@NotNull
public ReplaceDialog<G, A, R> getInstance() {
if (instance == null) {
- instance = new ReplaceDialog<G, A, R>(parent, copyBufferMapModel, objectChooser, faceObjectProviders, insertionModeSet);
+ instance = new ReplaceDialog<G, A, R>(parent, copyBuffer, objectChooser, faceObjectProviders, insertionModeSet);
}
return instance;
}
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:43:41 UTC (rev 7852)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:48:14 UTC (rev 7853)
@@ -426,7 +426,7 @@
final MapModel<G, A, R> copyBufferMapModel = mapControlFactory.newMapModel(mapArchObject);
final InsertionModeSet<G, A, R> insertionModeSet = new InsertionModeSet<G, A, R>(topmostInsertionMode);
final CopyBuffer<G, A, R> copyBuffer = new CopyBuffer<G, A, R>(mapViewSettings, copyBufferMapModel, gameObjectFactory, insertionModeSet);
- final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(mainViewFrame, copyBufferMapModel, objectChooser, mapViewManager, faceObjectProviders, insertionModeSet);
+ final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(mainViewFrame, copyBuffer, objectChooser, mapViewManager, faceObjectProviders, insertionModeSet);
new About(mainViewFrame);
exiter = new DefaultExiter(mainViewFrame);
scriptEditControl = new ScriptEditControl(scriptFileFilter, scriptExtension, mainViewFrame, globalSettings.getMapsDirectory(), prefs, exiter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:43:48
|
Revision: 7852
http://gridarta.svn.sourceforge.net/gridarta/?rev=7852&view=rev
Author: akirschbaum
Date: 2010-05-22 13:43:41 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Remove direct accesses to the copy buffer's internal map model.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:35:06 UTC (rev 7851)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:43:41 UTC (rev 7852)
@@ -31,6 +31,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.map.mapmodel.MapModelListener;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.Size2D;
@@ -86,6 +87,24 @@
}
/**
+ * Adds a {@link MapModelListener} to be notified about changes of the
+ * cut/copied game objects.
+ * @param listener the listener
+ */
+ public void addMapModelListener(@NotNull final MapModelListener<G, A, R> listener) {
+ mapModel.addMapModelListener(listener);
+ }
+
+ /**
+ * Removes a {@link MapModelListener} to be notified about changes of the
+ * cut/copied game objects.
+ * @param listener the listener
+ */
+ public void removeMapModelListener(@NotNull final MapModelListener<G, A, R> listener) {
+ mapModel.removeMapModelListener(listener);
+ }
+
+ /**
* Executing the Clear command.
* @param mapView the map view to clear or <code>null</code>
* @param performAction whether the action should be performed
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-22 13:35:06 UTC (rev 7851)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-22 13:43:41 UTC (rev 7852)
@@ -526,7 +526,6 @@
* @param mapViewSettings the map view settings instance
* @param archetypeSet the archetype set
* @param copyBuffer the copy buffer instance
- * @param copyBufferMapModel the copy buffer's map model
* @param objectChooser the animation objects instance to use
* @param mapManager the map manager instance
* @param mapViewManager the map view manager instance
@@ -537,7 +536,7 @@
* @param insertionModeSet the insertion mode set to use
* @param exiter the exiter instance
*/
- public MainActions(@NotNull final ReplaceDialogManager<G, A, R> replaceDialogManager, @NotNull final JFrame parent, @NotNull final GlobalSettings globalSettings, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final MapViewSettings mapViewSettings, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final MapModel<G, A, R> copyBufferMapModel, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R> mapManager, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final AbstractResources<G, A, R> resources, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final InsertionModeSet<G, A, R> insertionModeSet, @NotNull final Exiter exiter) {
+ public MainActions(@NotNull final ReplaceDialogManager<G, A, R> replaceDialogManager, @NotNull final JFrame parent, @NotNull final GlobalSettings globalSettings, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final MapViewSettings mapViewSettings, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final MapManager<G, A, R> mapManager, @NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final AbstractResources<G, A, R> resources, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final InsertionModeSet<G, A, R> insertionModeSet, @NotNull final Exiter exiter) {
this.replaceDialogManager = replaceDialogManager;
this.parent = parent;
this.globalSettings = globalSettings;
@@ -582,7 +581,7 @@
mapViewManager.addMapViewManagerListener(mapViewManagerListener);
currentMapView = mapViewManager.getActiveMapView();
archetypeSet.addArchetypeSetListener(archetypeSetListener);
- copyBufferMapModel.addMapModelListener(mapModelListener);
+ copyBuffer.addMapModelListener(mapModelListener);
final ExiterListener exiterListener = new ExiterListener() {
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:35:06 UTC (rev 7851)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-22 13:43:41 UTC (rev 7852)
@@ -473,7 +473,7 @@
new DefaultMapActions<G, A, R>(mainViewFrame, mainViewFrame, mapManager, mapViewManager, exitMatcher, FileFilters.mapFileFilter, selectedSquareModel, directionMap, allowRandomMapParameters, mapPropertiesDialogFactory, mapViewSettings, mapPathNormalizer, mapViewsManager, fileControl);
final ViewActions<G, A, R> viewActions = new ViewActions<G, A, R>(mapViewSettings, mapManager);
new MapFileActions<G, A, R>(imageCreator2, mapManager, mapViewsManager, mapViewManager, fileControl, mainViewFrame);
- new MainActions<G, A, R>(replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, copyBufferMapModel, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, gameObjectFactory, insertionModeSet, exiter);
+ new MainActions<G, A, R>(replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, gameObjectFactory, insertionModeSet, exiter);
final HelpActions helpActions = new HelpActions(mainViewFrame);
ActionUtils.newActions(ACTION_BUILDER, "Help", helpActions, "showHelp", "tipOfTheDay");
ActionUtils.newActions(ACTION_BUILDER, "Map", newMapDialogFactory, "newMap");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:35:13
|
Revision: 7851
http://gridarta.svn.sourceforge.net/gridarta/?rev=7851&view=rev
Author: akirschbaum
Date: 2010-05-22 13:35:06 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Merge duplicated code.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:22:06 UTC (rev 7850)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:35:06 UTC (rev 7851)
@@ -35,6 +35,7 @@
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.Size2D;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Common base implementation of CopyBuffer. The CopyBuffer is responsible for
@@ -86,26 +87,32 @@
/**
* Executing the Clear command.
- * @param mapView the map view to clear
+ * @param mapView the map view to clear or <code>null</code>
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
*/
- public void clear(@NotNull final MapView<G, A, R> mapView) {
- copyNCut(mapView, CopyMode.DO_CLEAR);
+ public boolean clear(@Nullable final MapView<G, A, R> mapView, final boolean performAction) {
+ return copyNCut(mapView, CopyMode.DO_CLEAR, performAction);
}
/**
* Executing the Cut command.
- * @param mapView the map view to cut from
+ * @param mapView the map view to cut from or <code>null</code>
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
*/
- public void cut(@NotNull final MapView<G, A, R> mapView) {
- copyNCut(mapView, CopyMode.DO_CUT);
+ public boolean cut(@Nullable final MapView<G, A, R> mapView, final boolean performAction) {
+ return copyNCut(mapView, CopyMode.DO_CUT, performAction);
}
/**
* Executing the Copy command.
- * @param mapView the map view to copy from
+ * @param mapView the map view to copy from or <code>null</code>
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
*/
- public void copy(@NotNull final MapView<G, A, R> mapView) {
- copyNCut(mapView, CopyMode.DO_COPY);
+ public boolean copy(@Nullable final MapView<G, A, R> mapView, final boolean performAction) {
+ return copyNCut(mapView, CopyMode.DO_COPY, performAction);
}
/**
@@ -113,76 +120,102 @@
* so similar).
* @param mapView the map view to operate on
* @param copyMode defines if we have a cut, copy or paste action
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
*/
- private void copyNCut(@NotNull final MapView<G, A, R> mapView, @NotNull final CopyMode copyMode) {
- final Rectangle selRec = mapView.getMapViewBasic().getMapGrid().getSelectedRec();
- assert selRec != null;
+ private boolean copyNCut(@Nullable final MapView<G, A, R> mapView, @NotNull final CopyMode copyMode, final boolean performAction) {
+ if (mapView == null) {
+ return false;
+ }
+ final Rectangle selectedRec = mapView.getMapViewBasic().getMapGrid().getSelectedRec();
+ if (selectedRec == null) {
+ return false;
+ }
- mapModel.beginTransaction("Cut / Clear");
- try {
- copyMode.prepare(mapModel, new Size2D(selRec.width + 1, selRec.height + 1));
+ if (performAction) {
+ mapModel.beginTransaction("Cut / Clear");
+ try {
+ copyMode.prepare(mapModel, new Size2D(selectedRec.width + 1, selectedRec.height + 1));
- final MapModel<G, A, R> mapModel2 = mapView.getMapControl().getMapModel();
- mapModel2.beginTransaction("Cut / Clear"); // TODO: I18N/L10N
- try {
- final Collection<G> gameObjectsToDelete = new HashSet<G>();
- for (final MapSquare<G, A, R> square : mapView.getMapViewBasic().getSelectedSquares()) {
- final int posX = square.getMapX() - selRec.x;
- final int posY = square.getMapY() - selRec.y;
- for (final G gameObject : square) {
- copyMode.process(mapModel, gameObject, mapViewSettings.isEditType(gameObject), gameObjectsToDelete, posX, posY, gameObjectFactory, insertionModeSet);
+ final MapModel<G, A, R> mapModel2 = mapView.getMapControl().getMapModel();
+ mapModel2.beginTransaction("Cut / Clear"); // TODO: I18N/L10N
+ try {
+ final Collection<G> gameObjectsToDelete = new HashSet<G>();
+ for (final MapSquare<G, A, R> square : mapView.getMapViewBasic().getSelectedSquares()) {
+ final int posX = square.getMapX() - selectedRec.x;
+ final int posY = square.getMapY() - selectedRec.y;
+ for (final G gameObject : square) {
+ copyMode.process(mapModel, gameObject, mapViewSettings.isEditType(gameObject), gameObjectsToDelete, posX, posY, gameObjectFactory, insertionModeSet);
+ }
}
- }
- for (final GameObject<G, A, R> gameObject : gameObjectsToDelete) {
- gameObject.remove();
+ for (final GameObject<G, A, R> gameObject : gameObjectsToDelete) {
+ gameObject.remove();
+ }
+ } finally {
+ mapModel2.endTransaction();
}
} finally {
- mapModel2.endTransaction();
+ mapModel.endTransaction();
}
- } finally {
- mapModel.endTransaction();
}
+
+ return true;
}
/**
* Executing the Paste command.
* @param mapView the map view to paste on
+ * @param performAction whether the action should be performed
+ * @return whether the action was or can be performed
* @todo paste only sub-regions when a region is selected
*/
- public void paste(@NotNull final MapView<G, A, R> mapView) {
+ public boolean paste(@Nullable final MapView<G, A, R> mapView, final boolean performAction) {
+ if (mapView == null) {
+ return false;
+ }
final Point startLocation = mapView.getMapViewBasic().getMapCursor().getLocation();
- assert startLocation != null;
+ if (startLocation == null) {
+ return false;
+ }
- final MapModel<G, A, R> mapModel2 = mapView.getMapControl().getMapModel();
- mapModel2.beginTransaction("Paste"); // TODO: I18N/L10N
- try {
- final Point pos = new Point();
- for (final MapSquare<G, A, R> square : mapModel) {
- pos.setLocation(startLocation.x + square.getMapX(), startLocation.y + square.getMapY());
- if (mapModel2.isPointValid(pos)) {
- for (final BaseObject<G, A, R, ?> gameObject : square) {
- if (!gameObject.isMulti()) {
- mapModel2.addCopyToMap(gameObject, pos, true, insertionModeSet.getTopmostInsertionMode());
+ if (mapModel.isEmpty()) {
+ return false;
+ }
+
+ if (performAction) {
+ final MapModel<G, A, R> mapModel2 = mapView.getMapControl().getMapModel();
+ mapModel2.beginTransaction("Paste"); // TODO: I18N/L10N
+ try {
+ final Point pos = new Point();
+ for (final MapSquare<G, A, R> square : mapModel) {
+ pos.setLocation(startLocation.x + square.getMapX(), startLocation.y + square.getMapY());
+ if (mapModel2.isPointValid(pos)) {
+ for (final BaseObject<G, A, R, ?> gameObject : square) {
+ if (!gameObject.isMulti()) {
+ mapModel2.addCopyToMap(gameObject, pos, true, insertionModeSet.getTopmostInsertionMode());
+ }
}
}
}
- }
- for (final MapSquare<G, A, R> square : mapModel) {
- pos.setLocation(startLocation);
- pos.translate(square.getMapX(), square.getMapY());
- if (mapModel2.isPointValid(pos)) {
- for (final BaseObject<G, A, R, ?> gameObject : square) {
- if (gameObject.isMulti()) {
- mapModel2.addCopyToMap(gameObject, pos, true, insertionModeSet.getTopmostInsertionMode());
+ for (final MapSquare<G, A, R> square : mapModel) {
+ pos.setLocation(startLocation);
+ pos.translate(square.getMapX(), square.getMapY());
+ if (mapModel2.isPointValid(pos)) {
+ for (final BaseObject<G, A, R, ?> gameObject : square) {
+ if (gameObject.isMulti()) {
+ mapModel2.addCopyToMap(gameObject, pos, true, insertionModeSet.getTopmostInsertionMode());
+ }
}
}
}
+ } finally {
+ mapModel2.endTransaction();
}
- } finally {
- mapModel2.endTransaction();
}
+
+ return true;
}
} // class CopyBuffer
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-22 13:22:06 UTC (rev 7850)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-22 13:35:06 UTC (rev 7851)
@@ -141,12 +141,6 @@
private final CopyBuffer<G, A, R> copyBuffer;
/**
- * The copy buffer's {@link MapModel}.
- */
- @NotNull
- private final MapModel<G, A, R> copyBufferMapModel;
-
- /**
* The ObjectChooser instance to use.
*/
@NotNull
@@ -551,7 +545,6 @@
this.mapViewSettings = mapViewSettings;
this.archetypeSet = archetypeSet;
this.copyBuffer = copyBuffer;
- this.copyBufferMapModel = copyBufferMapModel;
this.objectChooser = objectChooser;
this.resources = resources;
this.faceObjectProviders = faceObjectProviders;
@@ -635,10 +628,10 @@
* Enable/disable menu entries based on the current state.
*/
private void refreshMenus() {
- aClear.setEnabled(getClearEnabled() != null);
- aCut.setEnabled(getCutEnabled() != null);
- aCopy.setEnabled(getCopyEnabled() != null);
- aPaste.setEnabled(getPasteEnabled() != null);
+ aClear.setEnabled(copyBuffer.clear(currentMapView, false));
+ aCut.setEnabled(copyBuffer.cut(currentMapView, false));
+ aCopy.setEnabled(copyBuffer.copy(currentMapView, false));
+ aPaste.setEnabled(copyBuffer.paste(currentMapView, false));
aShiftNorth.setEnabled(getShiftEnabled(0) != null);
aShiftNorthEast.setEnabled(getShiftEnabled(4) != null);
aShiftEast.setEnabled(getShiftEnabled(1) != null);
@@ -669,10 +662,7 @@
*/
@ActionMethod
public void clear() {
- final MapView<G, A, R> mapView = getClearEnabled();
- if (mapView != null) {
- copyBuffer.clear(mapView);
- }
+ copyBuffer.clear(currentMapView, true);
}
/**
@@ -680,10 +670,7 @@
*/
@ActionMethod
public void cut() {
- final MapView<G, A, R> mapView = getCutEnabled();
- if (mapView != null) {
- copyBuffer.cut(mapView);
- }
+ copyBuffer.cut(currentMapView, true);
}
/**
@@ -691,10 +678,7 @@
*/
@ActionMethod
public void copy() {
- final MapView<G, A, R> mapView = getCopyEnabled();
- if (mapView != null) {
- copyBuffer.copy(mapView);
- }
+ copyBuffer.copy(currentMapView, true);
}
/**
@@ -702,10 +686,7 @@
*/
@ActionMethod
public void paste() {
- final MapView<G, A, R> mapView = getPasteEnabled();
- if (mapView != null) {
- copyBuffer.paste(mapView);
- }
+ copyBuffer.paste(currentMapView, true);
}
/**
@@ -1127,46 +1108,6 @@
}
/**
- * Determine if "clear" is enabled.
- * @return the map view to clear if "clear" is enabled, or <code>null</code>
- * otherwise
- */
- @Nullable
- private MapView<G, A, R> getClearEnabled() {
- return getSelection();
- }
-
- /**
- * Determine if "cut" is enabled.
- * @return the map view to cut from if "cut" is enabled, or
- * <code>null</code> otherwise
- */
- @Nullable
- private MapView<G, A, R> getCutEnabled() {
- return getSelection();
- }
-
- /**
- * Determine if "copy" is enabled.
- * @return the map view to copy from if "copy" is enabled, or
- * <code>null</code> otherwise
- */
- @Nullable
- private MapView<G, A, R> getCopyEnabled() {
- return getSelection();
- }
-
- /**
- * Determine if "paste" is enabled.
- * @return the map view to paste on if "paste" is enabled, or
- * <code>null</code> otherwise
- */
- @Nullable
- private MapView<G, A, R> getPasteEnabled() {
- return copyBufferMapModel.isEmpty() ? null : getCursor();
- }
-
- /**
* Determine if "shift" is enabled.
* @param dir The shift direction.
* @return A shift processor if "shift" is enabled, or <code>null</code>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:22:12
|
Revision: 7850
http://gridarta.svn.sourceforge.net/gridarta/?rev=7850&view=rev
Author: akirschbaum
Date: 2010-05-22 13:22:06 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Rename variable names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:06:21 UTC (rev 7849)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java 2010-05-22 13:22:06 UTC (rev 7850)
@@ -127,10 +127,10 @@
try {
final Collection<G> gameObjectsToDelete = new HashSet<G>();
for (final MapSquare<G, A, R> square : mapView.getMapViewBasic().getSelectedSquares()) {
- final int posx = square.getMapX() - selRec.x;
- final int posy = square.getMapY() - selRec.y;
+ final int posX = square.getMapX() - selRec.x;
+ final int posY = square.getMapY() - selRec.y;
for (final G gameObject : square) {
- copyMode.process(mapModel, gameObject, mapViewSettings.isEditType(gameObject), gameObjectsToDelete, posx, posy, gameObjectFactory, insertionModeSet);
+ copyMode.process(mapModel, gameObject, mapViewSettings.isEditType(gameObject), gameObjectsToDelete, posX, posY, gameObjectFactory, insertionModeSet);
}
}
@@ -148,18 +148,18 @@
/**
* Executing the Paste command.
* @param mapView the map view to paste on
- * @todo paste only subregions when a region is selected
+ * @todo paste only sub-regions when a region is selected
*/
public void paste(@NotNull final MapView<G, A, R> mapView) {
- final Point startp = mapView.getMapViewBasic().getMapCursor().getLocation();
- assert startp != null;
+ final Point startLocation = mapView.getMapViewBasic().getMapCursor().getLocation();
+ assert startLocation != null;
final MapModel<G, A, R> mapModel2 = mapView.getMapControl().getMapModel();
mapModel2.beginTransaction("Paste"); // TODO: I18N/L10N
try {
final Point pos = new Point();
for (final MapSquare<G, A, R> square : mapModel) {
- pos.setLocation(startp.x + square.getMapX(), startp.y + square.getMapY());
+ pos.setLocation(startLocation.x + square.getMapX(), startLocation.y + square.getMapY());
if (mapModel2.isPointValid(pos)) {
for (final BaseObject<G, A, R, ?> gameObject : square) {
if (!gameObject.isMulti()) {
@@ -170,7 +170,7 @@
}
for (final MapSquare<G, A, R> square : mapModel) {
- pos.setLocation(startp);
+ pos.setLocation(startLocation);
pos.translate(square.getMapX(), square.getMapY());
if (mapModel2.isPointValid(pos)) {
for (final BaseObject<G, A, R, ?> gameObject : square) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 13:06:31
|
Revision: 7849
http://gridarta.svn.sourceforge.net/gridarta/?rev=7849&view=rev
Author: akirschbaum
Date: 2010-05-22 13:06:21 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Unify text resources.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-22 09:48:24 UTC (rev 7848)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-22 13:06:21 UTC (rev 7849)
@@ -168,6 +168,7 @@
nextExit.mnemonic=N
nextExit.shortdescription=W\xE4hlt den n\xE4chsten Ausgang aus.
nextExit.longdescription=W\xE4hlt den n\xE4chsten Ausgang aus. Die Suche beginnt im Cursor-Feld oder links oben, falls kein Cursor aktiv ist.
+
prevExit.text=Vorheriger Ausgang
prevExit.mnemonic=O
prevExit.shortdescription=W\xE4hlt den vorigen Ausgang aus.
@@ -176,13 +177,16 @@
exitConnector.text=Ausg\xE4nge verbinden
exitConnector.mnemonic=A
exitConnector.shortdescription=Erzeugt oder aktualisiert einen Ausgang.
+
exitCopy.text=Ausgang kopieren
exitCopy.mnemonic=K
exitCopy.shortdescription=Kopiert die Position des Cursor-Feldes als Ausgangs-Position.
+
exitPaste.text=Ausgang einf\xFCgen
exitPaste.mnemonic=E
exitPaste.shortdescription=F\xFCgt die Ausgangs-Position in das Cursor-Feld ein.
exitPaste.longdescription=F\xFCgt die vorher gespeicherte Ausgangs-Position in das Cursor-Feld ein. Ein bereits existierender Ausgang wird aktualisiert; andernfalls wird ein neuer Ausgang erzeugt.
+
exitConnect.text=Ausg\xE4nge verbinden
exitConnect.mnemonic=V
exitConnect.shortdescription=Verbindet die Ausgangs-Position bidirektional mit dem Cursor-Feld.
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-22 09:48:24 UTC (rev 7848)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-22 13:06:21 UTC (rev 7849)
@@ -41,22 +41,31 @@
#cursor.mnemonic=
#moveCursor.text=
+#moveCursor.shortdescription=
#goNorth.text=
+#goNorth.shortdescription=
#goNorthEast.text=
+#goNorthEast.shortdescription=
#goEast.text=
+#goEast.shortdescription=
#goSouthEast.text=
+#goSouthEast.shortdescription=
#goSouth.text=
+#goSouth.shortdescription=
#goSouthWest.text=
+#goSouthWest.shortdescription=
#goWest.text=
+#goWest.shortdescription=
#goNorthWest.text=
+#goNorthWest.shortdescription=
#######
# Map
@@ -65,26 +74,37 @@
map.mnemonic=C
#goLocation.text=
+#goLocation.shortdescription=
#selectSquare.text=
+#selectSquare.shortdescription=
#startStopDrag.text=
+#startStopDrag.shortdescription=
#addToSelection.text=
+#addToSelection.shortdescription=
#subFromSelection.text=
+#subFromSelection.shortdescription=
#releaseDrag.text=
+#releaseDrag.shortdescription=
#insertArch.text=
+#insertArch.shortdescription=
#deleteArch.text=
+#deleteArch.shortdescription=
#selectArchAbove.text=
+#selectArchAbove.shortdescription=
#selectArchBelow.text=
+#selectArchBelow.shortdescription=
#archAttributes.text=
+#archAttributes.shortdescription=
# Map Manager
@@ -95,7 +115,6 @@
#saveAllMaps.text=
#saveAllMaps.shortdescription=
-#saveAllMaps.longdescription=
gridVisible.text=Montrer la grille
gridVisible.mnemonic=G
@@ -106,20 +125,29 @@
#smoothing.shortdescription=
#tileShow.text=
+#tileShow.shortdescription=
#mapCreateView.text=
+#mapCreateView.shortdescription=
+#mapCreateView.longdescription=
mapProperties.text=Propri\xE9t\xE9s de la carte
mapProperties.mnemonic=R
+#mapProperties.shortdescription=
+#mapProperties.longdescription=
#shrinkMapSize.text=
#shrinkMapSize.shortdescription=
#autoJoin.text=
#autoJoin.mnemonic=
+#autoJoin.shortdescription=
+#autoJoin.longdescription=
enterExit.text=Aller Sortie
enterExit.mnemonic=A
+#enterExit.shortdescription=
+#enterExit.longdescription=
#enterExitIOException.title=
#enterExitIOException.message=
@@ -136,34 +164,58 @@
#nextExit.text=
#nextExit.mnemonic=
+#nextExit.shortdescription=
+#nextExit.longdescription=
#prevExit.text=
#prevExit.mnemonic=
+#prevExit.shortdescription=
+#prevExit.longdescription=
#exitConnector.text=
+#exitConnector.shortdescription=
+
#exitCopy.text=
+#exitCopy.shortdescription=
+
#exitPaste.text=
+#exitPaste.shortdescription=
+#exitPaste.longdescription=
+
#exitConnect.text=
+#exitConnect.shortdescription=
+#exitConnect.longdescription=
enterNorthMap.text=Aller Carte Nord
+#enterNorthMap.shortdescription=
enterNorthEastMap.text=Aller Carte Nord-Est
+#enterNorthEastMap.shortdescription=
enterEastMap.text=Aller Carte Est
+#enterEastMap.shortdescription=
enterSouthEastMap.text=Aller Carte Sud-Est
+#enterSouthEastMap.shortdescription=
enterSouthMap.text=Aller Carte Sud
+#enterSouthMap.shortdescription=
enterSouthWestMap.text=Aller Carte Sud-Ouest
+#enterSouthWestMap.shortdescription=
enterWestMap.text=Aller Carte Ouest
+#enterWestMap.shortdescription=
enterNorthWestMap.text=Aller Carte Nord-Ouest
+#enterNorthWestMap.shortdescription=
#deleteUnknownObjects.text=
+#deleteUnknownObjects.shortdescription=
#gameObjectTextEditor.text=
+#gameObjectTextEditor.shortdescription=
+#gameObjectTextEditor.longdescription=
# Plugins
@@ -174,22 +226,28 @@
#editPlugins.text=
#editPlugins.mnemonic=
+#editPlugins.shortdescription=
#runPlugin.text=
+#runPlugin.shortdescription=
#savePlugins.text=
#savePlugins.mnemonic=
+#savePlugins.shortdescription=
#importPlugin.text=
#importPlugin.mnemonic=
+#importPlugin.shortdescription=
# Resources
viewTreasurelists.text=Afficher listes de tr\xE9sors
viewTreasurelists.mnemonic=T
+#viewTreasurelists.shortdescription=
collectSpells.text=Rassembler Sorts
collectSpells.mnemonic=S
+#collectSpells.shortdescription=
# Zoom
@@ -525,13 +583,11 @@
undo.text=Annuler
undo.name=Annuler {0}
undo.shortdescription=Annuler la derni\xE8re action
-undo.longdescription=Annule la derni\xE8re action si cela est possible
undo.mnemonic=U
redo.text=R\xE9p\xE9ter
redo.name=R\xE9p\xE9ter {0}
redo.shortdescription=R\xE9p\xE9ter la derni\xE8re action annul\xE9e
-redo.longdescription=R\xE9p\xE8te la derni\xE8re action annul\xE9e si cela est possible
redo.mnemonic=R
###########
@@ -541,33 +597,28 @@
file.mnemonic=F
saveMap.text=Enregistrer
-saveMap.shortdescription=Enregistrer la carte
-saveMap.longdescription=Enregistre la carte active
+saveMap.shortdescription=Enregistre la carte active
saveMap.mnemonic=E
#saveMap.error.text.title=
saveMap.error.text=Erreur lors de l''enregistrement.
saveMapAs.text=Enregistrer sous...
-saveMapAs.shortdescription=Enregistrer la carte sous un nouveau nom
-saveMapAs.longdescription=Enregistre la carte dans un fichier portant un nom diff\xE9rent
+saveMapAs.shortdescription=Enregistre la carte dans un fichier portant un nom diff\xE9rent
saveMapAs.mnemonic=S
saveMapAs.error.text=Erreur lors de l''enregistrement sous...
createImage.text=Cr\xE9er image
-createImage.shortdescription=Cr\xE9er une image \xE0 partir de la carte
-createImage.longdescription=Cr\xE9e une image \xE0 partir de la carte et l''enregistre dans un fichier
+createImage.shortdescription=Cr\xE9e une image \xE0 partir de la carte et l''enregistre dans un fichier
createImage.mnemonic=I
createImage.error.text=Erreur lors de la cr\xE9ation d''une image.
revertMap.text=Restaurer
-revertMap.shortdescription=Restaure la carte
-revertMap.longdescription=Restaure la carte selon la derni\xE8re version enregistr\xE9e
+revertMap.shortdescription=Restaure la carte selon la derni\xE8re version enregistr\xE9e
revertMap.mnemonic=R
revertMap.error.text=Erreur lors de la restauration de la carte.
closeMap.text=Fermer
-closeMap.shortdescription=Fermer la carte
-closeMap.longdescription=Ferme la carte active
+closeMap.shortdescription=Ferme la carte active
closeMap.mnemonic=F
#recent.text=
@@ -576,13 +627,11 @@
#recentItem.shortdescriptionformat=
newMap.text=Nouveau
-newMap.shortdescription=Cr\xE9er une nouvelle carte
-newMap.longdescription=Cr\xE9e une nouvelle carte
+newMap.shortdescription=Cr\xE9e une nouvelle carte
newMap.mnemonic=N
openFile.text=Ouvrir
-openFile.shortdescription=Ouvrir une carte
-openFile.longdescription=Ouvre une carte \xE0 partir d''un fichier
+openFile.shortdescription=Ouvre une carte \xE0 partir d''un fichier
openFile.mnemonic=O
openFile.error.text=Erreur lors du chargement.
@@ -596,8 +645,7 @@
#shortcuts.longdescription=
exit.text=Quitter
-exit.shortdescription=Quitter le programme
-exit.longdescription=Quitte le programme
+exit.shortdescription=Quitte le programme
exit.mnemonic=Q
@@ -609,56 +657,83 @@
clear.text=Effacer
clear.mnemonic=E
-clear.shortdescription=Effacer les cases s\xE9lectionn\xE9es
-clear.longdescription=Efface les cases s\xE9lectionn\xE9es
+clear.shortdescription=Efface les cases s\xE9lectionn\xE9es
cut.text=Couper
cut.mnemonic=O
+#cut.shortdescription=
copy.text=Copier
copy.mnemonic=C
+#copy.shortdescription=
paste.text=Coller
paste.mnemonic=L
+#paste.shortdescription=
#shift.text=
shift.mnemonic=S
+#shift.shortdescription=
#shiftNorth.text=
#shiftNorth.mnemonic=
+#shiftNorth.shortdescription=
#shiftNorthEast.text=
+#shiftNorthEast.shortdescription=
#shiftEast.text=
#shiftEast.mnemonic=
+#shiftEast.shortdescription=
#shiftSouthEast.text=
+#shiftSouthEast.shortdescription=
#shiftSouth.text=
#shiftSouth.mnemonic=
+#shiftSouth.shortdescription=
#shiftSouthWest.text=
+#shiftSouthWest.shortdescription=
#shiftWest.text=
#shiftWest.mnemonic=
+#shiftWest.shortdescription=
#shiftNorthWest.text=
+#shiftNorthWest.shortdescription=
replace.text=Remplacer
replace.mnemonic=M
+#replace.shortdescription=
#fillAuto.text=
#fillAuto.mnemonic=
+#fillAuto.shortdescription=
+#fillAuto.longdescription=
fillAbove.text=Remplir vers le haut
fillAbove.mnemonic=H
+#fillAbove.shortdescription=
+#fillAbove.longdescription=
fillBelow.text=Remplir vers le bas
fillBelow.mnemonic=B
+#fillBelow.shortdescription=
+#fillBelow.longdescription=
#randFillAuto.text=
+#randFillAuto.shortdescription=
+#randFillAuto.longdescription=
randFillAbove.text=Remplir en haut al\xE9atoirement
+#randFillAbove.shortdescription=
+#randFillAbove.longdescription=
randFillBelow.text=Remplir en bas al\xE9atoirement
+#randFillBelow.shortdescription=
+#randFillBelow.longdescription=
#floodfill.text=
+#floodfill.shortdescription=
+#floodfill.longdescription=
selectAll.text=Tout s\xE9lectionner
selectAll.mnemonic=T
+#selectAll.shortdescription=
#expandEmptySelection.text=
#expandEmptySelection.shortdescription=
@@ -678,9 +753,12 @@
collectArches.text=Rassembler Arches
collectArches.mnemonic=A
+#collectArches.shortdescription=
+#collectArches.longdescription=
#reloadFaces.text=
#reloadFaces.mnemonic=
+#reloadFaces.shortdescription=
#########
@@ -699,9 +777,11 @@
newScript.text=Nouveau script
newScript.mnemonic=N
+#newScript.shortdescription=
editScript.text=Editer script
editScript.mnemonic=E
+#editScript.shortdescription=
#validateMap.text=
#validateMap.mnemonic=
@@ -709,9 +789,11 @@
zoom.text=Zoom
zoom.mnemonic=Z
+#zoom.shortdescription=
gc.text=Garbage Collection
gc.mnemonic=G
+#gc.shortdescription=
#cleanCompletelyBlockedSquares.text=
#cleanCompletelyBlockedSquares.mnemonic=
@@ -726,12 +808,15 @@
showHelp.text=Aide
showHelp.mnemonic=A
+#showHelp.shortdescription=
#tipOfTheDay.text=
#tipOfTheDay.mnemonic=
+#tipOfTheDay.shortdescription=
about.text=\xC0 propos...
about.mnemonic=P
+#about.shortdescription=
#aboutTab.title=
#aboutRuntimeProperties.title=
@@ -793,28 +878,38 @@
lockAllPickmaps.text=Verrouiller les assortiments
lockAllPickmaps.mnemonic=V
+#lockAllPickmaps.shortdescription=
+#lockAllPickmaps.longdescription=
addNewPickmap.text=Nouvel assortiment
addNewPickmap.mnemonic=N
+#addNewPickmap.shortdescription=
#deletePickmap.text=
#deletePickmap.mnemonic=
+#deletePickmap.shortdescription=
openPickmapMap.text=Ouvrir assortiment actif comme carte
openPickmapMap.mnemonic=O
+#openPickmapMap.shortdescription=
savePickmap.text=Enregistrer assortiment actif
savePickmap.mnemonic=E
+#savePickmap.shortdescription=
revertPickmap.text=Restaurer assortiment actif
revertPickmap.mnemonic=R
+#revertPickmap.shortdescription=
#createPickmapFolder.text=
+#createPickmapFolder.shortdescription=
#deletePickmapFolder.text=
+#deletePickmapFolder.shortdescription=
#pickmapFolders.text=
#pickmapFolders.mnemonic=
+#pickmapFolders.shortdescription=
######
@@ -825,10 +920,12 @@
resetView.text=Vue normale
resetView.mnemonic=N
+#resetView.shortdescription=
#doubleFaces.text=
#doubleFaces.mnemonic=
#doubleFaces.shortdescription=
+#doubleFaces.longdescription=
#####################
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-22 09:48:24 UTC (rev 7848)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-22 13:06:21 UTC (rev 7849)
@@ -41,22 +41,31 @@
cursor.mnemonic=M
moveCursor.text=Flytta mark\xF6r
+#moveCursor.shortdescription=
goNorth.text=Flytta mark\xF6r norrut
+#goNorth.shortdescription=
goNorthEast.text=Flytta mark\xF6r nord\xF6st
+#goNorthEast.shortdescription=
goEast.text=Flytta mark\xF6r \xF6sterut
+#goEast.shortdescription=
goSouthEast.text=Flytta mark\xF6r syd\xF6st
+#goSouthEast.shortdescription=
goSouth.text=Flytta mark\xF6r s\xF6derut
+#goSouth.shortdescription=
goSouthWest.text=Flytta mark\xF6r sydv\xE4st
+#goSouthWest.shortdescription=
goWest.text=Flytta mark\xF6r v\xE4sterut
+#goWest.shortdescription=
goNorthWest.text=Flytta mark\xF6r nordv\xE4st
+#goNorthWest.shortdescription=
#######
# Map
@@ -65,26 +74,37 @@
map.mnemonic=K
#goLocation.text=
+#goLocation.shortdescription=
selectSquare.text=Markera ruta
+#selectSquare.shortdescription=
startStopDrag.text=B\xF6rja/sluta dragning
+#startStopDrag.shortdescription=
addToSelection.text=L\xE4gg till markering
+#addToSelection.shortdescription=
subFromSelection.text=Ta bort fr\xE5n markering
+#subFromSelection.shortdescription=
releaseDrag.text=Sl\xE4pp markering
+#releaseDrag.shortdescription=
insertArch.text=Stoppa in objekt
+#insertArch.shortdescription=
deleteArch.text=Radera objekt
+#deleteArch.shortdescription=
selectArchAbove.text=V\xE4lj \xF6vre objekt
+#selectArchAbove.shortdescription=
selectArchBelow.text=V\xE4lj undre objekt
+#selectArchBelow.shortdescription=
archAttributes.text=Objektattribut
+#archAttributes.shortdescription=
# Map Manager
@@ -95,7 +115,6 @@
#saveAllMaps.text=
#saveAllMaps.shortdescription=
-#saveAllMaps.longdescription=
gridVisible.text=Visa rutn\xE4t
gridVisible.mnemonic=R
@@ -106,20 +125,29 @@
#smoothing.shortdescription=
#tileShow.text=
+#tileShow.shortdescription=
#mapCreateView.text=
+#mapCreateView.shortdescription=
+#mapCreateView.longdescription=
mapProperties.text=Egenskaper...
mapProperties.mnemonic=E
+#mapProperties.shortdescription=
+#mapProperties.longdescription=
#shrinkMapSize.text=
#shrinkMapSize.shortdescription=
#autoJoin.text=
#autoJoin.mnemonic=
+#autoJoin.shortdescription=
+#autoJoin.longdescription=
enterExit.text=F\xF6lj utg\xE5ng
enterExit.mnemonic=F
+#enterExit.shortdescription=
+#enterExit.longdescription=
enterExitIOException.title=Ogiltig s\xF6kv\xE4g
enterExitIOException.message=Misslyckades \xF6ppna filen f\xF6r s\xF6kv\xE4gen.\n{0}
@@ -136,34 +164,58 @@
#nextExit.text=
#nextExit.mnemonic=
+#nextExit.shortdescription=
+#nextExit.longdescription=
#prevExit.text=
#prevExit.mnemonic=
+#prevExit.shortdescription=
+#prevExit.longdescription=
#exitConnector.text=
+#exitConnector.shortdescription=
+
#exitCopy.text=
+#exitCopy.shortdescription=
+
#exitPaste.text=
+#exitPaste.shortdescription=
+#exitPaste.longdescription=
+
#exitConnect.text=
+#exitConnect.shortdescription=
+#exitConnect.longdescription=
enterNorthMap.text=G\xE5 norr
+#enterNorthMap.shortdescription=
enterNorthEastMap.text=G\xE5 nordost
+#enterNorthEastMap.shortdescription
enterEastMap.text=G\xE5 \xF6st
+#enterEastMap.shortdescription=
enterSouthEastMap.text=G\xE5 sydost
+#enterSouthEastMap.shortdescription=
enterSouthMap.text=G\xE5 s\xF6der
+#enterSouthMap.shortdescription=
enterSouthWestMap.text=G\xE5 sydv\xE4st
+#enterSouthWestMap.shortdescription=
enterWestMap.text=G\xE5 v\xE4st
+#enterWestMap.shortdescription=
enterNorthWestMap.text=G\xE5 nordv\xE4st
+#enterNorthWestMap.shortdescription=
#deleteUnknownObjects.text=
+#deleteUnknownObjects.shortdescription=
#gameObjectTextEditor.text=
+#gameObjectTextEditor.shortdescription=
+#gameObjectTextEditor.longdescription=
# Plugins
@@ -174,22 +226,28 @@
#editPlugins.text=
#editPlugins.mnemonic=
+#editPlugins.shortdescription=
#runPlugin.text=
+#runPlugin.shortdescription=
#savePlugins.text=
#savePlugins.mnemonic=
+#savePlugins.shortdescription=
#importPlugin.text=
#importPlugin.mnemonic=
+#importPlugin.shortdescription=
# Resources
viewTreasurelists.text=Visa skattlistor
viewTreasurelists.mnemonic=V
+#viewTreasurelists.shortdescription=
collectSpells.text=Sammanst\xE4ll trollformler
collectSpells.mnemonic=S
+#collectSpells.shortdescription=
# Zoom
@@ -544,34 +602,29 @@
file.text=Arkiv
file.mnemonic=A
-save.text=Spara
-save.shortdescription=Spara karta
-save.longdescription=Sparar den aktuella kartan
-save.mnemonic=S
-save.error.text.title=Kunde inte spara
-save.error.text=Ett fel intr\xE4ffade:\n{0}
+saveMap.text=Spara
+saveMap.shortdescription=Sparar den aktuella kartan
+saveMap.mnemonic=S
+saveMap.error.text.title=Kunde inte spara
+saveMap.error.text=Ett fel intr\xE4ffade:\n{0}
saveMapAs.text=Spara som...
-saveMapAs.shortdescription=Spara karta som ny fil
-saveMapAs.longdescription=Sparar en karta under ett nytt filnamn
+saveMapAs.shortdescription=Sparar en karta under ett nytt filnamn
saveMapAs.mnemonic=A
saveMapAs.error.text=Kunde inte spara som
createImage.text=Skapa bild
-createImage.shortdescription=Skapa bild av kartan
-createImage.longdescription=Skapar en bild av kartan och sparar till fil
+createImage.shortdescription=Skapar en bild av kartan och sparar till fil
createImage.mnemonic=B
createImage.error.text=Kunde inte spara bilden
revertMap.text=\xC5terst\xE4ll
-revertMap.shortdescription=\xC5terst\xE4ller karta
-revertMap.longdescription=\xC5terst\xE4ller kartan till den senast sparade versionen
+revertMap.shortdescription=\xC5terst\xE4ller kartan till den senast sparade versionen
revertMap.mnemonic=R
revertMap.error.text=Kunde inte \xE5terst\xE4lla kartan
closeMap.text=St\xE4ng
-closeMap.shortdescription=St\xE4ng karta
-closeMap.longdescription=St\xE4nger den aktuella kartan
+closeMap.shortdescription=St\xE4nger den aktuella kartan
closeMap.mnemonic=G
recent.text=Nyligen
@@ -580,13 +633,11 @@
recentItem.shortdescriptionformat=\xD6ppnar karta {0} ({1})
newMap.text=Ny
-newMap.shortdescription=Ny karta
-newMap.longdescription=Skapar en ny karta
+newMap.shortdescription=Skapar en ny karta
newMap.mnemonic=Y
openFile.text=\xD6ppna...
-openFile.shortdescription=\xD6ppna karta
-openFile.longdescription=\xD6ppnar en karta fr\xE5n fil
+openFile.shortdescription=\xD6ppnar en karta fr\xE5n fil
openFile.mnemonic=P
#openFile.error.text=
@@ -600,8 +651,7 @@
#shortcuts.longdescription=
exit.text=Avsluta
-exit.shortdescription=Avsluta programmet
-exit.longdescription=Avslutar programmet
+exit.shortdescription=Avslutar programmet
exit.mnemonic=V
@@ -613,56 +663,83 @@
clear.text=Rensa
clear.mnemonic=R
-clear.shortdescription=Rensa markerade rutor
-clear.longdescription=Rensar alla markerade rutor
+clear.shortdescription=Rensar alla markerade rutor
cut.text=Klipp ut
cut.mnemonic=T
+#cut.shortdescription=
copy.text=Kopiera
copy.mnemonic=K
+#copy.shortdescription=
paste.text=Klistra in
paste.mnemonic=L
+#paste.shortdescription=
#shift.text=
#shift.mnemonic=
+#shift.shortdescription=
#shiftNorth.text=
#shiftNorth.mnemonic=
+#shiftNorth.shortdescription=
#shiftNorthEast.text=
+#shiftNorthEast.shortdescription=
#shiftEast.text=
#shiftEast.mnemonic=
+#shiftEast.shortdescription=
#shiftSouthEast.text=
+#shiftSouthEast.shortdescription=
#shiftSouth.text=
#shiftSouth.mnemonic=
+#shiftSouth.shortdescription=
#shiftSouthWest.text=
+#shiftSouthWest.shortdescription=
#shiftWest.text=
#shiftWest.mnemonic=
+#shiftWest.shortdescription=
#shiftNorthWest.text=
+#shiftNorthWest.shortdescription=
replace.text=Ers\xE4tt
replace.mnemonic=E
+#replace.shortdescription=
#fillAuto.text=
#fillAuto.mnemonic=
+#fillAuto.shortdescription=
+#fillAuto.longdescription=
fillAbove.text=Fyll ovanf\xF6r
fillAbove.mnemonic=O
+#fillAbove.shortdescription=
+#fillAbove.longdescription=
fillBelow.text=Fyll under
fillBelow.mnemonic=U
+#fillBelow.shortdescription=
+#fillBelow.longdescription=
#randFillAuto.text=
+#randFillAuto.shortdescription=
+#randFillAuto.longdescription=
randFillAbove.text=Slumpfyll ovanf\xF6r
+#randFillAbove.shortdescription=
+#randFillAbove.longdescription=
randFillBelow.text=Slumpfyll under
+#randFillBelow.shortdescription=
+#randFillBelow.longdescription=
#floodfill.text=
+#floodfill.shortdescription=
+#floodfill.longdescription=
selectAll.text=Markera allt
selectAll.mnemonic=M
+#selectAll.shortdescription=
#expandEmptySelection.text=
#expandEmptySelection.shortdescription=
@@ -682,9 +759,12 @@
collectArches.text=Skapa archetypsamling
collectArches.mnemonic=A
+#collectArches.shortdescription=
+#collectArches.longdescription=
reloadFaces.text=Ladda om bilder
reloadFaces.mnemonic=L
+#reloadFaces.shortdescription=
#########
@@ -703,9 +783,11 @@
newScript.text=Nytt script
newScript.mnemonic=P
+#newScript.shortdescription=
editScript.text=Redigera Script
editScript.mnemonic=E
+#editScript.shortdescription=
validateMap.text=Validera karta
validateMap.mnemonic=V
@@ -713,9 +795,11 @@
zoom.text=Zoom
zoom.mnemonic=Z
+#zoom.shortdescription=
gc.text=G\xF6r garbage collection
gc.mnemonic=G
+#gc.shortdescription=
#cleanCompletelyBlockedSquares.text=
#cleanCompletelyBlockedSquares.mnemonic=
@@ -730,12 +814,15 @@
showHelp.text=Inbyggd hj\xE4lp
showHelp.mnemonic=H
+#showHelp.shortdescription=
tipOfTheDay.text=Dagens tips...
tipOfTheDay.mnemonic=T
+#tipOfTheDay.shortdescription=
about.text=Om...
about.mnemonic=O
+#about.shortdescription=
aboutTab.title=Om
aboutRuntimeProperties.title=Runtime properties
@@ -797,28 +884,38 @@
lockAllPickmaps.text=L\xE5s alla plockkartor
lockAllPickmaps.mnemonic=L
+#lockAllPickmaps.shortdescription=
+#lockAllPickmaps.longdescription=
addNewPickmap.text=L\xE4gg till ny plockkarta
addNewPickmap.mnemonic=N
+#addNewPickmap.shortdescription=
#closePickmap.text=
#closePickmap.mnemonic=
+#deletePickmap.shortdescription=
openPickmapMap.text=\xD6ppna aktiv plockkarta som karta
openPickmapMap.mnemonic=P
+#openPickmapMap.shortdescription=
savePickmap.text=Spara aktiv plockkarta
savePickmap.mnemonic=S
+#savePickmap.shortdescription=
revertPickmap.text=\xC5terst\xE4ll plockkarta
revertPickmap.mnemonic=R
+#revertPickmap.shortdescription=
#createPickmapFolder.text=
+#createPickmapFolder.shortdescription=
#deletePickmapFolder.text=
+#deletePickmapFolder.shortdescription=
#pickmapFolders.text=
#pickmapFolders.mnemonic=
+#pickmapFolders.shortdescription=
######
@@ -831,10 +928,12 @@
resetView.text=\xC5terst\xE4ll visning
resetView.mnemonic=V
+#resetView.shortdescription=
doubleFaces.text=Visa dubbla bilder
doubleFaces.mnemonic=D
doubleFaces.shortdescription=Markera f\xF6r att rita ut dubbla bilder (t.ex. v\xE4ggar) p\xE5 samma s\xE4tt som klienten
+#doubleFaces.longdescription=
####################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-22 09:48:31
|
Revision: 7848
http://gridarta.svn.sourceforge.net/gridarta/?rev=7848&view=rev
Author: akirschbaum
Date: 2010-05-22 09:48:24 +0000 (Sat, 22 May 2010)
Log Message:
-----------
Implement File|Grow Selection and File|Shrink Selection: grows/shrinks the selection by one map square.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/ChangeLog
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/ChangeLog
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/atrinik/ChangeLog 2010-05-22 09:48:24 UTC (rev 7848)
@@ -1,3 +1,8 @@
+2010-05-22 Andreas Kirschbaum
+
+ * Implement File|Grow Selection and File|Shrink Selection:
+ grows/shrinks the selection by one map square.
+
2010-05-21 Andreas Kirschbaum
* Implement File|Expand Empty Selection: includes empty map
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-22 09:48:24 UTC (rev 7848)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
+edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection growSelection shrinkSelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
+mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/crossfire/ChangeLog 2010-05-22 09:48:24 UTC (rev 7848)
@@ -1,3 +1,8 @@
+2010-05-22 Andreas Kirschbaum
+
+ * Implement File|Grow Selection and File|Shrink Selection:
+ grows/shrinks the selection by one map square.
+
2010-05-21 Andreas Kirschbaum
* Implement File|Expand Empty Selection: includes empty map
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-22 09:48:24 UTC (rev 7848)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
+edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection growSelection shrinkSelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
+mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible smoothing enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/daimonin/ChangeLog 2010-05-22 09:48:24 UTC (rev 7848)
@@ -1,3 +1,8 @@
+2010-05-22 Andreas Kirschbaum
+
+ * Implement File|Grow Selection and File|Shrink Selection:
+ grows/shrinks the selection by one map square.
+
2010-05-21 Andreas Kirschbaum
* Implement File|Expand Empty Selection: includes empty map
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-22 09:48:24 UTC (rev 7848)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
+edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection growSelection shrinkSelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
+mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection growSelection shrinkSelection
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-22 09:48:24 UTC (rev 7848)
@@ -303,12 +303,24 @@
private final Action aSelectAll;
/**
- * Action called for "expand empty selection".
+ * Action called for "grow empty selection".
*/
@NotNull
private final Action aExpandEmptySelection;
/**
+ * Action called for "grow selection".
+ */
+ @NotNull
+ private final Action aGrowSelection;
+
+ /**
+ * Action called for "shrink selection".
+ */
+ @NotNull
+ private final Action aShrinkSelection;
+
+ /**
* Action called for "collect archetypes".
*/
private final Action aCollectArches;
@@ -567,6 +579,8 @@
aFloodfill = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "floodfill");
aSelectAll = ActionUtils.newAction(ACTION_BUILDER, "Map/Selection", this, "selectAll");
aExpandEmptySelection = ActionUtils.newAction(ACTION_BUILDER, "Map/Selection", this, "expandEmptySelection");
+ aGrowSelection = ActionUtils.newAction(ACTION_BUILDER, "Map/Selection", this, "growSelection");
+ aShrinkSelection = ActionUtils.newAction(ACTION_BUILDER, "Map/Selection", this, "shrinkSelection");
aCollectArches = ActionUtils.newAction(ACTION_BUILDER, "Tool", this, "collectArches");
aReloadFaces = ActionUtils.newAction(ACTION_BUILDER, "Image,Tool", this, "reloadFaces");
aValidateMap = ActionUtils.newAction(ACTION_BUILDER, "Map,Tool", this, "validateMap");
@@ -643,6 +657,8 @@
aFloodfill.setEnabled(getFloodfillEnabled() != null);
aSelectAll.setEnabled(getSelectAllEnabled() != null);
aExpandEmptySelection.setEnabled(getExpandEmptySelectionEnabled() != null);
+ aGrowSelection.setEnabled(getGrowSelectionEnabled() != null);
+ aShrinkSelection.setEnabled(getShrinkSelectionEnabled() != null);
aCollectArches.setEnabled(isCollectArchesEnabled());
aReloadFaces.setEnabled(!archetypeSet.isLoadedFromArchive());
aValidateMap.setEnabled(getValidateMapEnabled() != null);
@@ -968,6 +984,80 @@
}
/**
+ * Invoked when the user wants to grow the selection by one square.
+ */
+ @ActionMethod
+ public void growSelection() {
+ final Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>> selectedSquares = getGrowSelectionEnabled();
+ if (selectedSquares == null) {
+ return;
+ }
+
+ final MapView<G, A, R> mapView = selectedSquares.getFirst();
+ final MapGrid mapGrid = mapView.getMapViewBasic().getMapGrid();
+ final MapModel<G, A, R> mapModel = mapView.getMapControl().getMapModel();
+ final Point point = new Point();
+ mapGrid.beginTransaction();
+ try {
+ for (final MapSquare<G, A, R> mapSquare : selectedSquares.getSecond()) {
+ for (int dy = -1; dy <= 1; dy++) {
+ point.y = mapSquare.getMapY() + dy;
+ for (int dx = -1; dx <= 1; dx++) {
+ point.x = mapSquare.getMapX() + dx;
+ if (mapModel.isPointValid(point)) {
+ mapGrid.select(point, point, SelectionMode.ADD);
+ }
+ }
+ }
+ }
+ } finally {
+ mapGrid.endTransaction();
+ }
+ }
+
+ /**
+ * Invoked when the user wants to shrink the selection by one square.
+ */
+ @ActionMethod
+ public void shrinkSelection() {
+ final Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>> selectedSquares = getShrinkSelectionEnabled();
+ if (selectedSquares == null) {
+ return;
+ }
+
+ final MapView<G, A, R> mapView = selectedSquares.getFirst();
+ final MapGrid mapGrid = mapView.getMapViewBasic().getMapGrid();
+ final MapModel<G, A, R> mapModel = mapView.getMapControl().getMapModel();
+ final Point point = new Point();
+ final Map<MapSquare<G, A, R>, Void> mapSquaresToShrink = new IdentityHashMap<MapSquare<G, A, R>, Void>();
+ mapGrid.beginTransaction();
+ try {
+ for (final MapSquare<G, A, R> mapSquare : selectedSquares.getSecond()) {
+LOOP:
+ for (int dy = -1; dy <= 1; dy++) {
+ point.y = mapSquare.getMapY() + dy;
+ for (int dx = -1; dx <= 1; dx++) {
+ if (dx != 0 || dy != 0) {
+ point.x = mapSquare.getMapX() + dx;
+ if (mapModel.isPointValid(point) && (mapGrid.getFlags(point) & MapGrid.GRID_FLAG_SELECTION) == 0) {
+ mapSquaresToShrink.put(mapSquare, null);
+ break LOOP;
+ }
+ }
+ }
+ }
+ }
+ for (final MapSquare<G, A, R> mapSquare : mapSquaresToShrink.keySet()) {
+ point.x = mapSquare.getMapX();
+ point.y = mapSquare.getMapY();
+ mapGrid.select(point, point, SelectionMode.SUB);
+ }
+ } finally {
+ mapGrid.endTransaction();
+ }
+ }
+
+ /**
* Invoked when "collect archetypes" was selected.
*/
@ActionMethod
@@ -1211,6 +1301,38 @@
}
/**
+ * Determines if "grow selection" is enabled.
+ * @return the map view/selected squares to grow if "expand selection" is
+ * enabled, or <code>null</code> otherwise
+ */
+ @Nullable
+ private Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>> getGrowSelectionEnabled() {
+ final MapView<G, A, R> mapView = getSelection();
+ if (mapView == null) {
+ return null;
+ }
+
+ final List<MapSquare<G, A, R>> selectedSquares = mapView.getMapViewBasic().getSelectedSquares();
+ return selectedSquares.isEmpty() ? null : new Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>>(mapView, selectedSquares);
+ }
+
+ /**
+ * Determines if "shrink selection" is enabled.
+ * @return the map view/selected squares to shrink if "shrink selection" is
+ * enabled, or <code>null</code> otherwise
+ */
+ @Nullable
+ private Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>> getShrinkSelectionEnabled() {
+ final MapView<G, A, R> mapView = getSelection();
+ if (mapView == null) {
+ return null;
+ }
+
+ final List<MapSquare<G, A, R>> selectedSquares = mapView.getMapViewBasic().getSelectedSquares();
+ return selectedSquares.isEmpty() ? null : new Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>>(mapView, selectedSquares);
+ }
+
+ /**
* Returns whether "collect archetypes" is enabled.
* @return whether "collect archetypes" is enabled
*/
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-22 09:48:24 UTC (rev 7848)
@@ -795,9 +795,15 @@
selectAll.accel=ctrl pressed A
expandEmptySelection.text=Expand Empty Selection
-expandEmptySelection.shortdescription=Includes empty map squares surrounding selected empty squares to the selection.
+expandEmptySelection.shortdescription=Includes empty map squares surrounding selected empty squares to the selection.
+growSelection.text=Grow Selection
+growSelection.shortdescription=Grows the selection by one square.
+shrinkSelection.text=Shrink Selection
+shrinkSelection.shortdescription=Shrinks the selection by one square.
+
+
############
# Resources
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-22 09:48:24 UTC (rev 7848)
@@ -742,7 +742,13 @@
expandEmptySelection.text=Leere Auswahl erweitern
expandEmptySelection.shortdescription=Erweitert die Auswahl um leere Felder, die an ausgew\xE4hlte leere Felder angrenzen.
+growSelection.text=Auswahl vergr\xF6\xDFern
+growSelection.shortdescription=Vergr\xF6\xDFert die Auswahl um ein Feld.
+shrinkSelection.text=Auswahl verkleinern
+shrinkSelection.shortdescription=Verkleinert die Auswahl um ein Feld.
+
+
############
# Resources
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-22 09:48:24 UTC (rev 7848)
@@ -663,7 +663,13 @@
#expandEmptySelection.text=
#expandEmptySelection.shortdescription=
+#growSelection.text=
+#growSelection.shortdescription=
+#shrinkSelection.text=
+#shrinkSelection.shortdescription=
+
+
############
# Resources
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-21 17:17:52 UTC (rev 7847)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-22 09:48:24 UTC (rev 7848)
@@ -667,7 +667,13 @@
#expandEmptySelection.text=
#expandEmptySelection.shortdescription=
+#growSelection.text=
+#growSelection.shortdescription=
+#shrinkSelection.text=
+#shrinkSelection.shortdescription=
+
+
############
# Resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-21 17:17:59
|
Revision: 7847
http://gridarta.svn.sourceforge.net/gridarta/?rev=7847&view=rev
Author: akirschbaum
Date: 2010-05-21 17:17:52 +0000 (Fri, 21 May 2010)
Log Message:
-----------
Accelerate processing of selected map squares.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java 2010-05-21 17:08:55 UTC (rev 7846)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java 2010-05-21 17:17:52 UTC (rev 7847)
@@ -238,12 +238,14 @@
@NotNull
public Point[] getSelection() {
final List<Point> selection = new ArrayList<Point>();
- final Size2D mapSize = mapModel.getMapSize();
final Point pos = new Point();
- for (pos.x = 0; pos.x < mapSize.getWidth(); pos.x++) {
- for (pos.y = 0; pos.y < mapSize.getHeight(); pos.y++) {
- if ((mapGrid.getFlags(pos) & MapGrid.GRID_FLAG_SELECTION) > 0) {
- selection.add((Point) pos.clone());
+ final Rectangle selectedRec = mapGrid.getSelectedRec();
+ if (selectedRec != null) {
+ for (pos.x = selectedRec.x; pos.x < selectedRec.x + selectedRec.width; pos.x++) {
+ for (pos.y = selectedRec.y; pos.y < selectedRec.y + selectedRec.height; pos.y++) {
+ if ((mapGrid.getFlags(pos) & MapGrid.GRID_FLAG_SELECTION) > 0) {
+ selection.add((Point) pos.clone());
+ }
}
}
}
@@ -257,12 +259,14 @@
@NotNull
public List<MapSquare<G, A, R>> getSelectedSquares() {
final List<MapSquare<G, A, R>> selection = new ArrayList<MapSquare<G, A, R>>();
- final Size2D mapSize = mapModel.getMapSize();
final Point pos = new Point();
- for (pos.x = 0; pos.x < mapSize.getWidth(); pos.x++) {
- for (pos.y = 0; pos.y < mapSize.getHeight(); pos.y++) {
- if ((mapGrid.getFlags(pos) & MapGrid.GRID_FLAG_SELECTION) > 0) {
- selection.add(mapModel.getMapSquare(pos));
+ final Rectangle selectedRec = mapGrid.getSelectedRec();
+ if (selectedRec != null) {
+ for (pos.x = selectedRec.x; pos.x < selectedRec.x + selectedRec.width; pos.x++) {
+ for (pos.y = selectedRec.y; pos.y < selectedRec.y + selectedRec.height; pos.y++) {
+ if ((mapGrid.getFlags(pos) & MapGrid.GRID_FLAG_SELECTION) > 0) {
+ selection.add(mapModel.getMapSquare(pos));
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-21 17:09:02
|
Revision: 7846
http://gridarta.svn.sourceforge.net/gridarta/?rev=7846&view=rev
Author: akirschbaum
Date: 2010-05-21 17:08:55 +0000 (Fri, 21 May 2010)
Log Message:
-----------
Implement File|Expand Empty Selection: includes empty map squares surrounding selected empty map squares to the selection.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/ChangeLog
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/ChangeLog
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/atrinik/ChangeLog 2010-05-21 17:08:55 UTC (rev 7846)
@@ -1,3 +1,8 @@
+2010-05-21 Andreas Kirschbaum
+
+ * Implement File|Expand Empty Selection: includes empty map
+ squares surrounding selected empty map squares to the selection.
+
2010-05-20 Andreas Kirschbaum
* Implement #1644734 (Flood Fill short-cut/customizable
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-21 17:08:55 UTC (rev 7846)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
+edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
+mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/crossfire/ChangeLog 2010-05-21 17:08:55 UTC (rev 7846)
@@ -1,3 +1,8 @@
+2010-05-21 Andreas Kirschbaum
+
+ * Implement File|Expand Empty Selection: includes empty map
+ squares surrounding selected empty map squares to the selection.
+
2010-05-20 Andreas Kirschbaum
* Implement #1644734 (Flood Fill short-cut/customizable
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-21 17:08:55 UTC (rev 7846)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
+edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
+mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
mapwindowMap.menu=gridVisible smoothing enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/daimonin/ChangeLog 2010-05-21 17:08:55 UTC (rev 7846)
@@ -1,3 +1,8 @@
+2010-05-21 Andreas Kirschbaum
+
+ * Implement File|Expand Empty Selection: includes empty map
+ squares surrounding selected empty map squares to the selection.
+
2010-05-20 Andreas Kirschbaum
* Implement #1644734 (Flood Fill short-cut/customizable
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-21 17:08:55 UTC (rev 7846)
@@ -26,7 +26,7 @@
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
-edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
+edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
#pickmaps.menu: See gridarta
@@ -41,7 +41,7 @@
mapwindow.menubar=mapwindowFile mapwindowEdit mapwindowMap mapwindowCursor
mapwindowFile.menu=saveMap saveMapAs createImage - revertMap - closeMap
-mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
+mapwindowEdit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll expandEmptySelection
mapwindowMap.menu=gridVisible enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects
mapwindowCursor.menu=moveCursor - exitConnector - selectSquare startStopDrag addToSelection subFromSelection releaseDrag - insertArch deleteArch - selectArchAbove selectArchBelow - archAttributes
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-21 17:08:55 UTC (rev 7846)
@@ -20,7 +20,11 @@
package net.sf.gridarta.mainactions;
import java.awt.Component;
+import java.awt.Point;
import java.io.File;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.swing.Action;
import javax.swing.JFrame;
@@ -48,6 +52,7 @@
import net.sf.gridarta.model.map.grid.MapGrid;
import net.sf.gridarta.model.map.grid.MapGridEvent;
import net.sf.gridarta.model.map.grid.MapGridListener;
+import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
@@ -62,6 +67,7 @@
import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Exiter;
import net.sf.gridarta.utils.ExiterListener;
+import net.sf.gridarta.utils.Pair;
import net.sf.gridarta.utils.Size2D;
import net.sf.gridarta.validation.DelegatingMapValidator;
import net.sf.japi.swing.action.ActionBuilder;
@@ -297,6 +303,12 @@
private final Action aSelectAll;
/**
+ * Action called for "expand empty selection".
+ */
+ @NotNull
+ private final Action aExpandEmptySelection;
+
+ /**
* Action called for "collect archetypes".
*/
private final Action aCollectArches;
@@ -554,6 +566,7 @@
aRandFillBelow = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "randFillBelow");
aFloodfill = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "floodfill");
aSelectAll = ActionUtils.newAction(ACTION_BUILDER, "Map/Selection", this, "selectAll");
+ aExpandEmptySelection = ActionUtils.newAction(ACTION_BUILDER, "Map/Selection", this, "expandEmptySelection");
aCollectArches = ActionUtils.newAction(ACTION_BUILDER, "Tool", this, "collectArches");
aReloadFaces = ActionUtils.newAction(ACTION_BUILDER, "Image,Tool", this, "reloadFaces");
aValidateMap = ActionUtils.newAction(ACTION_BUILDER, "Map,Tool", this, "validateMap");
@@ -629,6 +642,7 @@
aRandFillBelow.setEnabled(getRandFillBelowEnabled() != null);
aFloodfill.setEnabled(getFloodfillEnabled() != null);
aSelectAll.setEnabled(getSelectAllEnabled() != null);
+ aExpandEmptySelection.setEnabled(getExpandEmptySelectionEnabled() != null);
aCollectArches.setEnabled(isCollectArchesEnabled());
aReloadFaces.setEnabled(!archetypeSet.isLoadedFromArchive());
aValidateMap.setEnabled(getValidateMapEnabled() != null);
@@ -901,6 +915,59 @@
}
/**
+ * Invoked when the user wants to expand the selction of empty map squares
+ * to surrounding empty map squares.
+ */
+ @ActionMethod
+ public void expandEmptySelection() {
+ final Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>> selectedSquares = getExpandEmptySelectionEnabled();
+ if (selectedSquares != null) {
+ final MapView<G, A, R> mapView = selectedSquares.getFirst();
+ final MapGrid mapGrid = mapView.getMapViewBasic().getMapGrid();
+ final Map<MapSquare<G, A, R>, Void> newSelection = new IdentityHashMap<MapSquare<G, A, R>, Void>();
+ Map<MapSquare<G, A, R>, Void> todo = new IdentityHashMap<MapSquare<G, A, R>, Void>();
+ for (final MapSquare<G, A, R> mapSquare : selectedSquares.getSecond()) {
+ todo.put(mapSquare, null);
+ newSelection.put(mapSquare, null);
+ }
+ final MapModel<G, A, R> mapModel = mapView.getMapControl().getMapModel();
+ final Point point = new Point();
+ while (!todo.isEmpty()) {
+ final Map<MapSquare<G, A, R>, Void> tmp = new IdentityHashMap<MapSquare<G, A, R>, Void>();
+ for (final MapSquare<G, A, R> mapSquare : todo.keySet()) {
+ for (int dy = -1; dy <= 1; dy++) {
+ point.y = mapSquare.getMapY() + dy;
+ for (int dx = -1; dx <= 1; dx++) {
+ if (dx != 0 || dy != 0) {
+ point.x = mapSquare.getMapX() + dx;
+ if (mapModel.isPointValid(point)) {
+ final MapSquare<G, A, R> newMapSquare = mapModel.getMapSquare(point);
+ if (newMapSquare.isEmpty() && !newSelection.containsKey(newMapSquare)) {
+ tmp.put(newMapSquare, null);
+ newSelection.put(newMapSquare, null);
+ }
+ }
+ }
+ }
+ }
+ }
+ todo = tmp;
+ }
+ mapGrid.beginTransaction();
+ try {
+ mapGrid.unSelect();
+ for (final MapSquare<G, A, R> mapSquare : newSelection.keySet()) {
+ point.x = mapSquare.getMapX();
+ point.y = mapSquare.getMapY();
+ mapGrid.select(point, point, SelectionMode.ADD);
+ }
+ } finally {
+ mapGrid.endTransaction();
+ }
+ }
+ }
+
+ /**
* Invoked when "collect archetypes" was selected.
*/
@ActionMethod
@@ -1122,6 +1189,28 @@
}
/**
+ * Determine if "expand empty selection" is enabled.
+ * @return the map view/selected squares to expand if "expand empty
+ * selection" is enabled, or <code>null</code> otherwise
+ */
+ @Nullable
+ private Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>> getExpandEmptySelectionEnabled() {
+ final MapView<G, A, R> mapView = getSelection();
+ if (mapView == null) {
+ return null;
+ }
+
+ final List<MapSquare<G, A, R>> selectedSquares = mapView.getMapViewBasic().getSelectedSquares();
+ for (final MapSquare<G, A, R> selectedSquare : selectedSquares) {
+ if (selectedSquare.isEmpty()) {
+ return new Pair<MapView<G, A, R>, List<MapSquare<G, A, R>>>(mapView, selectedSquares);
+ }
+ }
+
+ return null;
+ }
+
+ /**
* Returns whether "collect archetypes" is enabled.
* @return whether "collect archetypes" is enabled
*/
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-21 17:08:55 UTC (rev 7846)
@@ -794,7 +794,10 @@
selectAll.shortdescription=Selects all map squares of the current map.
selectAll.accel=ctrl pressed A
+expandEmptySelection.text=Expand Empty Selection
+expandEmptySelection.shortdescription=Includes empty map squares surrounding selected empty squares to the selection.
+
############
# Resources
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-21 17:08:55 UTC (rev 7846)
@@ -739,7 +739,10 @@
selectAll.mnemonic=S
selectAll.shortdescription=W\xE4hlt alle Felder der aktiven Karte aus.
+expandEmptySelection.text=Leere Auswahl erweitern
+expandEmptySelection.shortdescription=Erweitert die Auswahl um leere Felder, die an ausgew\xE4hlte leere Felder angrenzen.
+
############
# Resources
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-21 17:08:55 UTC (rev 7846)
@@ -660,7 +660,10 @@
selectAll.text=Tout s\xE9lectionner
selectAll.mnemonic=T
+#expandEmptySelection.text=
+#expandEmptySelection.shortdescription=
+
############
# Resources
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-21 17:06:38 UTC (rev 7845)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-21 17:08:55 UTC (rev 7846)
@@ -664,7 +664,10 @@
selectAll.text=Markera allt
selectAll.mnemonic=M
+#expandEmptySelection.text=
+#expandEmptySelection.shortdescription=
+
############
# Resources
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-21 17:06:45
|
Revision: 7845
http://gridarta.svn.sourceforge.net/gridarta/?rev=7845&view=rev
Author: akirschbaum
Date: 2010-05-21 17:06:38 +0000 (Fri, 21 May 2010)
Log Message:
-----------
Add @NotNull annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/map/grid/MapGrid.java
Modified: trunk/src/app/net/sf/gridarta/model/map/grid/MapGrid.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/grid/MapGrid.java 2010-05-21 17:05:46 UTC (rev 7844)
+++ trunk/src/app/net/sf/gridarta/model/map/grid/MapGrid.java 2010-05-21 17:06:38 UTC (rev 7845)
@@ -23,6 +23,7 @@
import java.awt.Rectangle;
import net.sf.gridarta.utils.EventListenerList2;
import net.sf.gridarta.utils.Size2D;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
@@ -43,26 +44,31 @@
/**
* 2D-array to store grid flags.
*/
+ @NotNull
private int[][] gridFlags;
/**
* Left upper coordinates of rectangle that is beeing processed.
*/
+ @NotNull
private final Point cornerMin = new Point();
/**
* Right lower coordinates of rectangle that is beeing processed.
*/
+ @NotNull
private final Point cornerMax = new Point();
/**
* Size of <code>gridFlags[][]</code>.
*/
+ @NotNull
private Size2D gridSize;
/**
* Rectangle to store location of last grid change.
*/
+ @NotNull
private final Rectangle recChange = new Rectangle();
/**
@@ -141,11 +147,13 @@
/**
* The MapGridListeners to inform of changes.
*/
+ @NotNull
private final EventListenerList2<MapGridListener> listenerList = new EventListenerList2<MapGridListener>(MapGridListener.class);
/**
* Set to size of grid size. Used to test if coordinates are on the map.
*/
+ @NotNull
private final Rectangle mapRec = new Rectangle();
/**
@@ -167,7 +175,7 @@
* Create a MapGrid.
* @param gridSize Size of the grid
*/
- public MapGrid(final Size2D gridSize) {
+ public MapGrid(@NotNull final Size2D gridSize) {
mapRec.setBounds(0, 0, gridSize.getWidth(), gridSize.getHeight());
this.gridSize = gridSize;
gridFlags = new int[gridSize.getWidth()][gridSize.getHeight()];
@@ -177,7 +185,7 @@
* Register a MapGridListener.
* @param listener MapGridListener to register
*/
- public void addMapGridListener(final MapGridListener listener) {
+ public void addMapGridListener(@NotNull final MapGridListener listener) {
listenerList.add(listener);
}
@@ -185,7 +193,7 @@
* Remove a MapGridListener.
* @param listener MapGridListener to remove
*/
- public void removeMapGridListener(final MapGridListener listener) {
+ public void removeMapGridListener(@NotNull final MapGridListener listener) {
listenerList.remove(listener);
}
@@ -193,6 +201,7 @@
* Returns a Rectangle with position and dimension of this grid.
* @return A Rectangle with position and dimension of this grid.
*/
+ @NotNull
public Rectangle getMapRec() {
return mapRec;
}
@@ -201,7 +210,7 @@
* Resize MapGrid. Old flags will be copied to the new grid.
* @param newSize new grid size
*/
- public void resize(final Size2D newSize) {
+ public void resize(@NotNull final Size2D newSize) {
if (gridSize.equals(newSize)) {
// Nothing to do
return;
@@ -263,7 +272,7 @@
* Unhighlight the given cursor position.
* @param pos Map coordinates of square to unhighlight
*/
- public void unSetCursor(final Point pos) {
+ public void unSetCursor(@NotNull final Point pos) {
beginTransaction();
try {
unsetFlags(pos.x, pos.y, pos.x, pos.y, GRID_FLAG_CURSOR);
@@ -276,7 +285,7 @@
* Highlight the given cursor position.
* @param pos Map coordinates of square to highlight
*/
- public void setCursor(final Point pos) {
+ public void setCursor(@NotNull final Point pos) {
beginTransaction();
try {
setFlags(pos.x, pos.y, pos.x, pos.y, GRID_FLAG_CURSOR);
@@ -292,7 +301,7 @@
* @param end Point on the opposite corner
* @see MapGrid#unPreSelect(Point, Point)
*/
- public void preSelect(final Point start, final Point end) {
+ public void preSelect(@NotNull final Point start, @NotNull final Point end) {
beginTransaction();
try {
calcRec(start, end);
@@ -313,7 +322,7 @@
* GRID_FLAG_SELECTING but no other square has set GRID_FLAG_SELECTING; if
* this precondition does not hold, it does not correctly update the flags
*/
- public void updatePreSelect(final Point start, final Point oldEnd, final Point newEnd) {
+ public void updatePreSelect(@NotNull final Point start, @NotNull final Point oldEnd, @NotNull final Point newEnd) {
final Point old1 = new Point(Math.min(start.x, oldEnd.x), Math.min(start.y, oldEnd.y));
final Point old2 = new Point(Math.max(start.x, oldEnd.x), Math.max(start.y, oldEnd.y));
final Point new1 = new Point(Math.min(start.x, newEnd.x), Math.min(start.y, newEnd.y));
@@ -372,7 +381,7 @@
* @param end Coordinates of the opposite corner
* @see MapGrid#preSelect(Point, Point)
*/
- public void unPreSelect(final Point start, final Point end) {
+ public void unPreSelect(@NotNull final Point start, @NotNull final Point end) {
beginTransaction();
try {
calcRec(start, end);
@@ -389,7 +398,7 @@
* @param pos Opposite corner of rectangle
* @param selectionMode Method how to handle already selected squares
*/
- public void select(final Point dragStart, final Point pos, final SelectionMode selectionMode) {
+ public void select(@NotNull final Point dragStart, @NotNull final Point pos, @NotNull final SelectionMode selectionMode) {
beginTransaction();
try {
calcRec(dragStart, pos);
@@ -423,7 +432,7 @@
* @param p1 Coordinates of one corner of a rectangle
* @param p2 Coordinates of the opposite corner
*/
- private void calcRec(final Point p1, final Point p2) {
+ private void calcRec(@NotNull final Point p1, @NotNull final Point p2) {
if (p1.x > p2.x) {
cornerMin.x = p2.x;
cornerMax.x = p1.x;
@@ -445,7 +454,7 @@
* @param p Point to check
* @return <code>true</code> if {@link #GRID_FLAG_ERROR} is set
*/
- public boolean hasError(final Point p) {
+ public boolean hasError(@NotNull final Point p) {
return (gridFlags[p.x][p.y] & GRID_FLAG_ERROR) != 0;
}
@@ -464,7 +473,7 @@
* @param p coordinates of square
* @return Grid flags
*/
- public int getFlags(final Point p) {
+ public int getFlags(@NotNull final Point p) {
return gridFlags[p.x][p.y];
}
@@ -473,6 +482,7 @@
* squares.
* @return changed rectangle
*/
+ @NotNull
public Rectangle getRecChange() {
return new Rectangle(recChange);
}
@@ -481,6 +491,7 @@
* Get size of grid.
* @return Size of grid
*/
+ @NotNull
public Size2D getSize() {
return gridSize;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-21 17:05:52
|
Revision: 7844
http://gridarta.svn.sourceforge.net/gridarta/?rev=7844&view=rev
Author: akirschbaum
Date: 2010-05-21 17:05:46 +0000 (Fri, 21 May 2010)
Log Message:
-----------
Improve comment.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java 2010-05-20 21:15:50 UTC (rev 7843)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java 2010-05-21 17:05:46 UTC (rev 7844)
@@ -252,7 +252,7 @@
/**
* Returns the selected squares.
- * @return the selected squares
+ * @return the selected squares; the list may be modified by the caller
*/
@NotNull
public List<MapSquare<G, A, R>> getSelectedSquares() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-20 21:15:58
|
Revision: 7843
http://gridarta.svn.sourceforge.net/gridarta/?rev=7843&view=rev
Author: akirschbaum
Date: 2010-05-20 21:15:50 +0000 (Thu, 20 May 2010)
Log Message:
-----------
Implement #1644734 (Flood Fill short-cut/customizable short-cuts): add menu entry File|Configure Shortcuts...
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
trunk/crossfire/ChangeLog
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
trunk/daimonin/ChangeLog
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
trunk/src/app/net/sf/gridarta/utils/ActionUtils.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/shortcuts/
trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeDialog.java
trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java
trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeFieldListener.java
trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsDialog.java
trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsManager.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/atrinik/ChangeLog 2010-05-20 21:15:50 UTC (rev 7843)
@@ -1,3 +1,8 @@
+2010-05-20 Andreas Kirschbaum
+
+ * Implement #1644734 (Flood Fill short-cut/customizable
+ short-cuts): add menu entry File|Configure Shortcuts...
+
2010-05-16 Andreas Kirschbaum
* Improve UI of go location dialog: to go to coordinates (12,4)
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties 2010-05-20 21:15:50 UTC (rev 7843)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/crossfire/ChangeLog 2010-05-20 21:15:50 UTC (rev 7843)
@@ -1,3 +1,8 @@
+2010-05-20 Andreas Kirschbaum
+
+ * Implement #1644734 (Flood Fill short-cut/customizable
+ short-cuts): add menu entry File|Configure Shortcuts...
+
2010-05-16 Andreas Kirschbaum
* Improve UI of go location dialog: to go to coordinates (12,4)
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties 2010-05-20 21:15:50 UTC (rev 7843)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/daimonin/ChangeLog 2010-05-20 21:15:50 UTC (rev 7843)
@@ -1,3 +1,8 @@
+2010-05-20 Andreas Kirschbaum
+
+ * Implement #1644734 (Flood Fill short-cut/customizable
+ short-cuts): add menu entry File|Configure Shortcuts...
+
2010-05-16 Andreas Kirschbaum
* Improve UI of go location dialog: to go to coordinates (12,4)
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties 2010-05-20 21:15:50 UTC (rev 7843)
@@ -25,7 +25,7 @@
########
# Menus
main.menubar=file edit map archetypes pickmaps resources tools analyze view plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options - exit
+file.menu=newMap openFile recent closeMap - saveMap saveMapAs closeAllMaps revertMap createImage - options shortcuts - exit
edit.menu=undo redo - clear cut copy paste - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodfill - selectAll
map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes
Added: trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeDialog.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeDialog.java 2010-05-20 21:15:50 UTC (rev 7843)
@@ -0,0 +1,260 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.shortcuts;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import javax.swing.Action;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.KeyStroke;
+import javax.swing.WindowConstants;
+import javax.swing.border.TitledBorder;
+import net.sf.gridarta.gui.utils.GUIConstants;
+import net.sf.gridarta.utils.ActionUtils;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A dialog that asks for a {@link KeyStroke}.
+ * @author Andreas Kirschbaum
+ */
+public class KeyStrokeDialog extends JOptionPane {
+
+ /**
+ * The serial Version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * The {@link ShortcutsManager} for checking conflicts.
+ */
+ @NotNull
+ private final ShortcutsManager shortcutsManager;
+
+ /**
+ * The {@link Action} being redefined. This action will not cause
+ * conflicts.
+ */
+ @NotNull
+ private final Action action;
+
+ /**
+ * The {@link ActionBuilder}.
+ */
+ @NotNull
+ private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
+
+ /**
+ * The {@link JButton} for ok.
+ */
+ @NotNull
+ private final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "keyStrokeOkay", this));
+
+ /**
+ * The {@link JButton} for cancel.
+ */
+ @NotNull
+ private final JButton cancelButton = new JButton(ACTION_BUILDER.createAction(false, "keyStrokeCancel", this));
+
+ /**
+ * The {@link JDialog} instance.
+ */
+ @NotNull
+ private final JDialog dialog;
+
+ /**
+ * The key stroke input field.
+ */
+ @NotNull
+ private final KeyStrokeField keyStroke;
+
+ /**
+ * The text area showing conflicts between the new key stroke and assigned
+ * key strokes.
+ */
+ @NotNull
+ private final JTextArea conflictsTextArea = new JTextArea();
+
+ /**
+ * Creates a new instance.
+ * @param parentComponent the parent component for the dialog
+ * @param shortcutsManager the shortcuts manager for checking conflicts
+ * @param action the action being redefined; this action will not cause
+ * conflicts
+ */
+ public KeyStrokeDialog(@NotNull final Component parentComponent, @NotNull final ShortcutsManager shortcutsManager, @NotNull final Action action) {
+ this.shortcutsManager = shortcutsManager;
+ this.action = action;
+ okButton.setDefaultCapable(true);
+ setOptions(new Object[] { okButton, cancelButton, });
+
+ keyStroke = new KeyStrokeField(ActionUtils.getShortcut(action));
+ final KeyStrokeFieldListener keyStrokeFieldListener = new KeyStrokeFieldListener() {
+
+ @Override
+ public void keyStrokeChanged(@NotNull final KeyStroke keyStroke) {
+ updateKeyStroke();
+ }
+
+ };
+ keyStroke.addKeyStrokeListener(keyStrokeFieldListener);
+
+ conflictsTextArea.setEditable(false);
+ conflictsTextArea.setLineWrap(true);
+ conflictsTextArea.setWrapStyleWord(true);
+ conflictsTextArea.setFocusable(false);
+ conflictsTextArea.setRows(3);
+
+ setMessage(createPanel());
+
+ dialog = createDialog(parentComponent, ACTION_BUILDER.getString("keyStroke.title"));
+ dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ dialog.getRootPane().setDefaultButton(okButton);
+ dialog.setModal(true);
+ dialog.pack();
+ }
+
+ /**
+ * Opens the dialog. Returns when the dialog has been dismissed.
+ * @param parentComponent the parent component for the dialog
+ * @return whether "ok" was selected
+ */
+ public boolean showDialog(@NotNull final Component parentComponent) {
+ dialog.setLocationRelativeTo(parentComponent);
+ updateKeyStroke();
+ keyStroke.requestFocusInWindow();
+ setInitialValue(keyStroke);
+ dialog.setVisible(true);
+ return getValue() == okButton;
+ }
+
+ /**
+ * Creates the GUI.
+ * @return the panel containing the GUI
+ */
+ @NotNull
+ private JPanel createPanel() {
+ final GridBagConstraints gbc = new GridBagConstraints();
+
+ final JComponent keyStrokePanel = new JPanel(new GridBagLayout());
+ keyStrokePanel.setBorder(new TitledBorder(ACTION_BUILDER.getString("keyStroke.borderKeyStroke")));
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ keyStrokePanel.add(keyStroke, gbc);
+
+ final JComponent conflictsPanel = new JPanel(new GridBagLayout());
+ conflictsPanel.setBorder(new TitledBorder(ACTION_BUILDER.getString("keyStroke.borderConflicts")));
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ conflictsPanel.add(conflictsTextArea, gbc);
+
+ final JPanel panel = new JPanel(new GridBagLayout());
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ panel.add(keyStrokePanel, gbc);
+ gbc.gridy++;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weighty = 1.0;
+ panel.add(conflictsPanel, gbc);
+
+ panel.setBorder(GUIConstants.DIALOG_BORDER);
+ return panel;
+ }
+
+ /**
+ * Action method for okay.
+ */
+ @ActionMethod
+ public void keyStrokeOkay() {
+ setValue(okButton);
+ }
+
+ /**
+ * Action method for cancel.
+ */
+ @ActionMethod
+ public void keyStrokeCancel() {
+ setValue(cancelButton);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setValue(final Object newValue) {
+ super.setValue(newValue);
+ if (newValue != UNINITIALIZED_VALUE) {
+ dialog.dispose();
+ }
+ }
+
+ /**
+ * Updates the information shown for the selected action.
+ */
+ private void updateKeyStroke() {
+ final KeyStroke newKeyStroke = getKeyStroke();
+ Action conflictAction = null;
+ if (newKeyStroke != null) {
+ for (final Action tmp : shortcutsManager) {
+ if (tmp != action) {
+ final KeyStroke tmpKeyStroke = ActionUtils.getShortcut(tmp);
+ if (newKeyStroke.equals(tmpKeyStroke)) {
+ conflictAction = tmp;
+ break;
+ }
+ }
+ }
+ }
+ if (conflictAction == null) {
+ conflictsTextArea.setText("");
+ okButton.setEnabled(true);
+ } else {
+ conflictsTextArea.setText(ACTION_BUILDER.format("keyStroke.borderConflictAssigned", ActionUtils.getActionName(conflictAction), ActionUtils.getActionCategory(conflictAction)));
+ okButton.setEnabled(false);
+ }
+ }
+
+ /**
+ * Returns the currently shown key stroke.
+ * @return the key stroke or <code>null</code>
+ */
+ @Nullable
+ public KeyStroke getKeyStroke() {
+ return keyStroke.getKeyStroke();
+ }
+
+} // class KeyStrokeDialog
Property changes on: trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java 2010-05-20 21:15:50 UTC (rev 7843)
@@ -0,0 +1,147 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.shortcuts;
+
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import javax.swing.JComponent;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+import net.sf.gridarta.utils.EventListenerList2;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A {@link JComponent} for selecting a {@link KeyStroke}.
+ * @author Andreas Kirschbaum
+ */
+public class KeyStrokeField extends JTextField {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * The {@link KeyStrokeFieldListener KeyStrokeFieldListeners} to be
+ * notified.
+ */
+ @NotNull
+ private final EventListenerList2<KeyStrokeFieldListener> listeners = new EventListenerList2<KeyStrokeFieldListener>(KeyStrokeFieldListener.class);
+
+ /**
+ * The currently shown {@link KeyStroke}.
+ */
+ @Nullable
+ private KeyStroke keyStroke;
+
+ /**
+ * Creates a new instance.
+ * @param keyStroke the key stroke to show initially or <code>null</code>
+ */
+ public KeyStrokeField(@Nullable final KeyStroke keyStroke) {
+ this.keyStroke = keyStroke;
+
+ setFocusable(true);
+ final KeyListener keyListener = new KeyListener() {
+
+ @Override
+ public void keyTyped(@NotNull final KeyEvent e) {
+ // ignore
+ }
+
+ @Override
+ public void keyPressed(@NotNull final KeyEvent e) {
+ switch (e.getKeyCode()) {
+ case KeyEvent.VK_SHIFT:
+ case KeyEvent.VK_CONTROL:
+ case KeyEvent.VK_ALT:
+ case KeyEvent.VK_CAPS_LOCK:
+ case KeyEvent.VK_META:
+ case KeyEvent.VK_ALT_GRAPH:
+ // ignore modifier keys
+ break;
+
+ default:
+ setKeyStroke(KeyStroke.getKeyStrokeForEvent(e));
+ break;
+ }
+ }
+
+ @Override
+ public void keyReleased(@NotNull final KeyEvent e) {
+ // ignore
+ }
+
+ };
+ addKeyListener(keyListener);
+
+ getInputMap(WHEN_IN_FOCUSED_WINDOW).clear();
+ getInputMap(WHEN_IN_FOCUSED_WINDOW).setParent(null);
+ getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).clear();
+ getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).setParent(null);
+ getInputMap(WHEN_FOCUSED).clear();
+ getInputMap(WHEN_FOCUSED).setParent(null);
+
+ updateKeyStroke();
+ }
+
+ /**
+ * Adds a {@link KeyStrokeFieldListener} to be notified about changes.
+ * @param listener the listener
+ */
+ public void addKeyStrokeListener(@NotNull final KeyStrokeFieldListener listener) {
+ listeners.add(listener);
+ }
+
+ /**
+ * Returns the currently shown {@link KeyStroke}.
+ * @return the key stroke or <code>null</code>
+ */
+ @Nullable
+ public KeyStroke getKeyStroke() {
+ return keyStroke;
+ }
+
+ /**
+ * Updates the current key stroke.
+ * @param keyStroke the new key stroke
+ */
+ private void setKeyStroke(@NotNull final KeyStroke keyStroke) {
+ if (this.keyStroke == keyStroke) {
+ return;
+ }
+
+ this.keyStroke = keyStroke;
+ updateKeyStroke();
+ for (final KeyStrokeFieldListener listener : listeners.getListeners()) {
+ listener.keyStrokeChanged(keyStroke);
+ }
+ }
+
+ /**
+ * Updates the shown text to reflect the current value of {@link
+ * #keyStroke}.
+ */
+ private void updateKeyStroke() {
+ setText(keyStroke == null ? "none" : keyStroke.toString());
+ }
+
+} // class KeyStrokeField
Property changes on: trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeFieldListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeFieldListener.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeFieldListener.java 2010-05-20 21:15:50 UTC (rev 7843)
@@ -0,0 +1,38 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.shortcuts;
+
+import java.util.EventListener;
+import javax.swing.KeyStroke;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface for listeners interested in {@link KeyStrokeField} related events.
+ * @author Andreas Kirschbaum
+ */
+public interface KeyStrokeFieldListener extends EventListener {
+
+ /**
+ * The shown {@link KeyStroke} did change.
+ * @param keyStroke the new key stroke
+ */
+ void keyStrokeChanged(@NotNull KeyStroke keyStroke);
+
+} // interface KeyStrokeFieldListener
Property changes on: trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeFieldListener.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsDialog.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsDialog.java 2010-05-20 21:15:50 UTC (rev 7843)
@@ -0,0 +1,620 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.shortcuts;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.util.regex.Pattern;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTree;
+import javax.swing.JViewport;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.ToolTipManager;
+import javax.swing.WindowConstants;
+import javax.swing.border.LineBorder;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreeSelectionModel;
+import net.sf.gridarta.gui.utils.GUIConstants;
+import net.sf.gridarta.utils.ActionUtils;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
+import net.sf.japi.swing.action.ActionMethod;
+import net.sf.japi.swing.action.IconManager;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ShortcutsDialog extends JOptionPane {
+
+ /**
+ * The serial Version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Prefix for internal category names. Used only for sorting tree nodes.
+ */
+ @NotNull
+ private static final String CATEGORY_PREFIX = "1";
+
+ /**
+ * Prefix for internal action names. Used only for sorting tree nodes.
+ */
+ @NotNull
+ private static final String ACTION_PREFIX = "2";
+
+ /**
+ * The {@link ShortcutsManager} to affect.
+ */
+ @NotNull
+ private final ShortcutsManager shortcutsManager;
+
+ /**
+ * The {@link ActionBuilder}.
+ */
+ @NotNull
+ private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
+
+ /**
+ * The {@link Pattern} to split a list of action categories.
+ */
+ @NotNull
+ private static final Pattern patternCategories = Pattern.compile(",");
+
+ /**
+ * The {@link Pattern} to split a category into sub-categories.
+ */
+ @NotNull
+ private static final Pattern patterSubnCategories = Pattern.compile("/");
+
+ /**
+ * The {@link JButton} for ok.
+ */
+ @NotNull
+ private final JButton okButton = new JButton(ACTION_BUILDER.createAction(false, "shortcutsOkay", this));
+
+ /**
+ * The {@link Action} for the "set shortcut" button.
+ */
+ @NotNull
+ private final Action aSetShortcut = ACTION_BUILDER.createAction(false, "shortcutsSetShortcut", this);
+
+ /**
+ * The {@link Action} for the "unset shortcut" button.
+ */
+ @NotNull
+ private final Action aUnsetShortcut = ACTION_BUILDER.createAction(false, "shortcutsUnsetShortcut", this);
+
+ /**
+ * The {@link JDialog} instance.
+ */
+ @NotNull
+ private final JDialog dialog;
+
+ /**
+ * The {@link JTree} showing all actions.
+ */
+ @NotNull
+ private final JTree actionsTree = new JTree() {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String convertValueToText(final Object value, final boolean selected, final boolean expanded, final boolean leaf, final int row, final boolean hasFocus) {
+ final Action action = getAction(value);
+ if (action != null) {
+ return ActionUtils.getActionName(action);
+ }
+
+ return super.convertValueToText(value, selected, expanded, leaf, row, hasFocus);
+ }
+
+ };
+
+
+ /**
+ * The description of the selected action.
+ */
+ @NotNull
+ private final JTextArea actionDescription = new JTextArea();
+
+ /**
+ * The shortcut of the selected action.
+ */
+ @NotNull
+ private final JTextArea actionShortcut = new JTextArea();
+
+ /**
+ * The selected {@link Action} or <code>null</code>.
+ */
+ @Nullable
+ private Action selectedAction = null;
+
+ /**
+ * Creates a new instance.
+ * @param parentComponent the parent component for the dialog
+ * @param shortcutsManager the shortcuts manager to affect
+ */
+ public ShortcutsDialog(@NotNull final Component parentComponent, @NotNull final ShortcutsManager shortcutsManager) {
+ this.shortcutsManager = shortcutsManager;
+ okButton.setDefaultCapable(true);
+ final JButton defaultsButton = new JButton(ACTION_BUILDER.createAction(false, "shortcutsDefaults", this));
+ setOptions(new Object[] { okButton, defaultsButton });
+
+ setMessage(createPanel());
+
+ dialog = createDialog(parentComponent, ACTION_BUILDER.getString("shortcuts.title"));
+ dialog.setResizable(true);
+ dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ dialog.getRootPane().setDefaultButton(okButton);
+ dialog.setModal(true);
+
+ dialog.setMinimumSize(new Dimension(400, 300));
+ dialog.setPreferredSize(new Dimension(800, 600));
+ dialog.pack();
+ }
+
+ /**
+ * Opens the dialog. Returns when the dialog has been dismissed.
+ * @param parentComponent the parent component for the dialog
+ */
+ public void showDialog(@NotNull final Component parentComponent) {
+ dialog.setLocationRelativeTo(parentComponent);
+ dialog.setVisible(true);
+ setInitialValue(actionsTree);
+ actionsTree.setSelectionRow(0);
+ updateSelectedAction();
+ }
+
+ /**
+ * Creates the GUI.
+ * @return the panel containing the GUI
+ */
+ @NotNull
+ private JPanel createPanel() {
+ final DefaultMutableTreeNode top = new DefaultMutableTreeNode(ACTION_BUILDER.getString("shortcuts.allActions"));
+ createNodes(top);
+
+ actionsTree.setModel(new DefaultTreeModel(top, false));
+ actionsTree.setRootVisible(false);
+ actionsTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+ final TreeSelectionListener treeSelectionListener = new TreeSelectionListener() {
+
+ @Override
+ public void valueChanged(@NotNull final TreeSelectionEvent e) {
+ setSelectedAction(getAction(actionsTree.getLastSelectedPathComponent()));
+ }
+
+ };
+ actionsTree.addTreeSelectionListener(treeSelectionListener);
+
+ final Icon emptyIcon = IconManager.getDefaultIconManager().getIcon(ACTION_BUILDER.getString("shortcuts.defaultIcon"));
+ final TreeCellRenderer treeCellRenderer = new DefaultTreeCellRenderer() {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * The leaf icon. Set to <code>null</code> to use the default icon.
+ */
+ @Nullable
+ private Icon icon = null;
+
+ @Override
+ public Component getTreeCellRendererComponent(final JTree tree, final Object value, final boolean sel, final boolean expanded, final boolean leaf, final int row, final boolean hasFocus) {
+ if (leaf) {
+ final Action action = getAction(value);
+ if (action != null) {
+ final Icon tmpIcon = ActionUtils.getActionIcon(action);
+ icon = tmpIcon == null ? emptyIcon : tmpIcon;
+ setToolTipText(ActionUtils.getActionDescription(action));
+ } else {
+ icon = emptyIcon;
+ }
+ } else {
+ icon = emptyIcon;
+ }
+ return super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @noinspection RefusedBequest
+ */
+ @Override
+ public Icon getLeafIcon() {
+ return icon;
+ }
+
+ };
+ actionsTree.setCellRenderer(treeCellRenderer);
+
+ ToolTipManager.sharedInstance().registerComponent(actionsTree);
+
+ final GridBagConstraints gbc = new GridBagConstraints();
+ gbc.insets = new Insets(2, 2, 2, 2);
+
+ final JScrollPane actionsScrollPane = new JScrollPane();
+ actionsScrollPane.setViewportView(actionsTree);
+ actionsScrollPane.setBackground(actionsTree.getBackground());
+ actionsScrollPane.getViewport().add(actionsTree);
+ actionsScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ actionsScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
+ actionsScrollPane.getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
+ final JComponent actionsPanel = new JPanel(new GridBagLayout());
+ actionsPanel.setBorder(new TitledBorder(ACTION_BUILDER.getString("shortcuts.borderAllActions")));
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ actionsPanel.add(actionsScrollPane, gbc);
+
+ actionDescription.setEditable(false);
+ actionDescription.setColumns(20);
+ actionDescription.setLineWrap(true);
+ actionDescription.setWrapStyleWord(true);
+ actionDescription.setBorder(new LineBorder(Color.black));
+ actionDescription.setFocusable(false);
+
+ actionShortcut.setEditable(false);
+ actionShortcut.setColumns(20);
+ actionShortcut.setRows(3);
+ actionShortcut.setLineWrap(true);
+ actionShortcut.setWrapStyleWord(true);
+ actionShortcut.setBorder(new LineBorder(Color.black));
+ actionShortcut.setFocusable(false);
+
+ final Container actionDescriptionPanel = new JPanel(new GridBagLayout());
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ actionDescriptionPanel.add(new JLabel(ACTION_BUILDER.getString("shortcuts.actionDescription")), gbc);
+ gbc.gridy++;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weighty = 1.0;
+ actionDescriptionPanel.add(actionDescription, gbc);
+
+ final Container actionShortcutPanel = new JPanel(new GridBagLayout());
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ actionShortcutPanel.add(new JLabel(ACTION_BUILDER.getString("shortcuts.shortcut")), gbc);
+ gbc.gridy++;
+ actionShortcutPanel.add(actionShortcut, gbc);
+
+ final Component addShortcutButton = new JButton(aSetShortcut);
+ final Component removeShortcutButton = new JButton(aUnsetShortcut);
+ final Container actionButtonsPanel = new JPanel();
+ actionButtonsPanel.setLayout(new GridBagLayout());
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ actionButtonsPanel.add(addShortcutButton, gbc);
+ gbc.gridy++;
+ actionButtonsPanel.add(removeShortcutButton, gbc);
+
+ final JComponent selectedActionPanel = new JPanel();
+ selectedActionPanel.setLayout(new GridBagLayout());
+ selectedActionPanel.setBorder(new TitledBorder(ACTION_BUILDER.getString("shortcuts.selectedAction")));
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ selectedActionPanel.add(actionDescriptionPanel, gbc);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.weighty = 0.0;
+ gbc.gridy++;
+ selectedActionPanel.add(actionShortcutPanel, gbc);
+ gbc.gridy++;
+ selectedActionPanel.add(actionButtonsPanel, gbc);
+
+ final JPanel panel = new JPanel(new GridBagLayout());
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.fill = GridBagConstraints.BOTH;
+ gbc.weightx = 1.0;
+ gbc.weighty = 1.0;
+ panel.add(actionsPanel, gbc);
+ gbc.gridx++;
+ gbc.weightx = 0.0;
+ panel.add(selectedActionPanel, gbc);
+
+ panel.setBorder(GUIConstants.DIALOG_BORDER);
+ return panel;
+ }
+
+ /**
+ * Action method for okay.
+ */
+ @ActionMethod
+ public void shortcutsOkay() {
+ setValue(okButton);
+ }
+
+ /**
+ * Action method for restore to defaults.
+ */
+ @ActionMethod
+ public void shortcutsDefaults() {
+ if (ACTION_BUILDER.showQuestionDialog(dialog, "shortcutsRestoreDefaults")) {
+ shortcutsManager.revertAll();
+ updateSelectedAction();
+ shortcutsManager.saveShortcuts();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void setValue(final Object newValue) {
+ super.setValue(newValue);
+ if (newValue != UNINITIALIZED_VALUE) {
+ dialog.dispose();
+ }
+ }
+
+ /**
+ * Creates nodes for all actions.
+ * @param root the root node
+ */
+ private void createNodes(@NotNull final DefaultMutableTreeNode root) {
+ for (final Action action : shortcutsManager) {
+ final String categories = ActionUtils.getActionCategory(action);
+ for (final String category : patternCategories.split(categories, -1)) {
+ addNode(root, category, action);
+ }
+ }
+ }
+
+ /**
+ * Adds an {@link Action} to a branch node.
+ * @param root the root node
+ * @param category the category to add to
+ * @param action the action to add
+ */
+ private static void addNode(@NotNull final DefaultMutableTreeNode root, @NotNull final CharSequence category, @NotNull final Action action) {
+ final DefaultMutableTreeNode node = getOrCreateNodeForCategory(root, category);
+ final MutableTreeNode treeNode = new DefaultMutableTreeNode(action, false);
+ insertChildNode(node, treeNode);
+ }
+
+ /**
+ * Returns the branch {@link DefaultMutableTreeNode} for a given category.
+ * @param root the root node to start from
+ * @param category the category
+ * @return the branch node for the category
+ */
+ @NotNull
+ private static DefaultMutableTreeNode getOrCreateNodeForCategory(@NotNull final DefaultMutableTreeNode root, @NotNull final CharSequence category) {
+ DefaultMutableTreeNode node = root;
+ for (final String subCategory : patterSubnCategories.split(category, -1)) {
+ node = getOrCreateChildNode(node, subCategory);
+ }
+ return node;
+ }
+
+ /**
+ * Returns a child node by category name.
+ * @param root the root node
+ * @param subCategory the node name
+ * @return the child node
+ */
+ @NotNull
+ private static DefaultMutableTreeNode getOrCreateChildNode(@NotNull final MutableTreeNode root, @NotNull final String subCategory) {
+ final int childCount = root.getChildCount();
+ for (int i = 0; i < childCount; i++) {
+ final TreeNode treeNode = root.getChildAt(i);
+ final String nodeTitle = getTitle(treeNode);
+ if (nodeTitle != null && nodeTitle.equals(CATEGORY_PREFIX + subCategory)) {
+ assert treeNode instanceof DefaultMutableTreeNode;
+ return (DefaultMutableTreeNode) treeNode;
+ }
+ }
+
+ final DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode(subCategory);
+ insertChildNode(root, treeNode);
+ return treeNode;
+ }
+
+ /**
+ * Inserts a new child node into a branch node.
+ * @param branchNode the branch node
+ * @param childNode the child node
+ */
+ private static void insertChildNode(@NotNull final MutableTreeNode branchNode, @NotNull final MutableTreeNode childNode) {
+ branchNode.insert(childNode, getInsertionIndex(branchNode, childNode));
+ }
+
+ /**
+ * Returns the index to insert a new child node into a parent node.
+ * @param parentNode the parent node
+ * @param childNode the child node
+ * @return the insertion index
+ */
+ private static int getInsertionIndex(@NotNull final TreeNode parentNode, @NotNull final TreeNode childNode) {
+ final String childTitle = getTitle(childNode);
+ if (childTitle == null) {
+ throw new IllegalArgumentException();
+ }
+
+ final int childCount = parentNode.getChildCount();
+ for (int i = 0; i < childCount; i++) {
+ final TreeNode treeNode = parentNode.getChildAt(i);
+ final String nodeTitle = getTitle(treeNode);
+ if (nodeTitle != null && nodeTitle.compareToIgnoreCase(childTitle) > 0) {
+ return i;
+ }
+ }
+
+ return childCount;
+ }
+
+ /**
+ * Returns the {@link Action} for a node in the action tree.
+ * @param node the node
+ * @return the action or <code>null</code>
+ */
+ @Nullable
+ private static Action getAction(@Nullable final Object node) {
+ if (node == null || !(node instanceof DefaultMutableTreeNode)) {
+ return null;
+ }
+
+ final DefaultMutableTreeNode defaultMutableTreeNode = (DefaultMutableTreeNode) node;
+ final Object userObject = defaultMutableTreeNode.getUserObject();
+ if (userObject == null || !(userObject instanceof Action)) {
+ return null;
+ }
+
+ return (Action) userObject;
+ }
+
+ /**
+ * Returns the category for a node in the action tree.
+ * @param node the node
+ * @return the category or <code>null</code>
+ */
+ @Nullable
+ private static String getTitle(@NotNull final TreeNode node) {
+ if (!(node instanceof DefaultMutableTreeNode)) {
+ return null;
+ }
+
+ final DefaultMutableTreeNode defaultMutableTreeNode = (DefaultMutableTreeNode) node;
+ final Object userObject = defaultMutableTreeNode.getUserObject();
+ if (userObject == null) {
+ return null;
+ }
+
+ if (userObject instanceof String) {
+ return CATEGORY_PREFIX + userObject;
+ }
+
+ if (userObject instanceof Action) {
+ return ACTION_PREFIX + ActionUtils.getActionName((Action) userObject);
+ }
+
+ return null;
+ }
+
+ /**
+ * Updates the selected action.
+ * @param selectedAction the new selected action
+ */
+ private void setSelectedAction(@Nullable final Action selectedAction) {
+ if (this.selectedAction == selectedAction) {
+ return;
+ }
+
+ this.selectedAction = selectedAction;
+ updateSelectedAction();
+ }
+
+ /**
+ * Updates the information shown for the selected action.
+ */
+ private void updateSelectedAction() {
+ actionDescription.setText(selectedAction == null ? "" : ActionUtils.getActionDescription(selectedAction));
+ if (selectedAction == null) {
+ actionShortcut.setText("");
+ } else {
+ actionShortcut.setText(ActionUtils.getShortcutDescription(selectedAction, Action.ACCELERATOR_KEY));
+ }
+ aSetShortcut.setEnabled(selectedAction != null);
+ aUnsetShortcut.setEnabled(getUnsetShortcutEnabled() != null);
+ }
+
+ /**
+ * Returns whether "unset shortcut" is enabled.
+ * @return the action to affect if enabled or <code>null</code>
+ */
+ @Nullable
+ private Action getUnsetShortcutEnabled() {
+ final Action action = selectedAction;
+ return action != null && ActionUtils.getShortcut(action) != null ? action : null;
+ }
+
+ /**
+ * The action method for the "set shortcut" button.
+ */
+ @ActionMethod
+ public void shortcutsSetShortcut() {
+ final Action action = selectedAction;
+ if (action == null) {
+ return;
+ }
+
+ final KeyStrokeDialog keyStrokeDialog = new KeyStrokeDialog(dialog, shortcutsManager, action);
+ if (keyStrokeDialog.showDialog(dialog)) {
+ ActionUtils.setActionShortcut(action, keyStrokeDialog.getKeyStroke());
+ updateSelectedAction();
+ shortcutsManager.saveShortcuts();
+ }
+ }
+
+ /**
+ * The action method for the "set shortcut" button.
+ */
+ @ActionMethod
+ public void shortcutsUnsetShortcut() {
+ final Action action = getUnsetShortcutEnabled();
+ if (action != null) {
+ ActionUtils.setActionShortcut(action, null);
+ updateSelectedAction();
+ shortcutsManager.saveShortcuts();
+ }
+ }
+
+} // class ShortcutsDialog
Property changes on: trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsManager.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsManager.java 2010-05-20 21:15:50 UTC (rev 7843)
@@ -0,0 +1,258 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.shortcuts;
+
+import java.awt.Component;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.prefs.AbstractPreferences;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
+import javax.swing.Action;
+import javax.swing.ActionMap;
+import javax.swing.KeyStroke;
+import net.sf.gridarta.MainControl;
+import net.sf.gridarta.utils.ActionUtils;
+import net.sf.japi.swing.action.ActionBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Manager for shortcuts of all {@link Action Actions} in an {@link
+ * ActionBuilder} instance.
+ * @author Andreas Kirschbaum
+ */
+public class ShortcutsManager implements Iterable<Action> {
+
+ /**
+ * The prefix for preferences keys for shortcuts.
+ */
+ @NotNull
+ private static final String PREFERENCES_SHORTCUT_PREFIX = "shortcut.";
+
+ /**
+ * The prefix for preferences keys for shortcut comments.
+ */
+ @NotNull
+ private static final String PREFERENCES_COMMENT_PREFIX = "prefs." + PREFERENCES_SHORTCUT_PREFIX;
+
+ /**
+ * A {@link Comparator} that compares {@link Action Actions} by name.
+ */
+ @NotNull
+ private static final Comparator<Action> actionComparator = new Comparator<Action>() {
+
+ @Override
+ public int compare(@NotNull final Action o1, @NotNull final Action o2) {
+ return ActionUtils.getActionName(o1).compareToIgnoreCase(ActionUtils.getActionName(o2));
+ }
+
+ };
+
+ /**
+ * The managed {@link ActionBuilder}.
+ */
+ @NotNull
+ private final ActionBuilder actionBuilder;
+
+ /**
+ * The {@link Preferences} for storing/restoring shortcuts.
+ */
+ @NotNull
+ private final Preferences preferences = Preferences.userNodeForPackage(MainControl.class);
+
+ /**
+ * Creates a new instance.
+ * @param actionBuilder the action builder to manage
+ */
+ public ShortcutsManager(@NotNull final ActionBuilder actionBuilder) {
+ this.actionBuilder = actionBuilder;
+
+ for (final Action action : this) {
+ final Object acceleratorKey = action.getValue(Action.ACCELERATOR_KEY);
+ if (acceleratorKey != null) {
+ action.putValue(ActionUtils.DEFAULT_ACCELERATOR_KEY, acceleratorKey);
+ }
+ }
+
+ final Preferences commentPreferences = new AbstractPreferences(null, "") {
+
+ @Override
+ protected void putSpi(final String key, final String value) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Nullable
+ @Override
+ protected String getSpi(@NotNull final String key) {
+ if (!key.startsWith(PREFERENCES_COMMENT_PREFIX)) {
+ return null;
+ }
+
+ final String actionKey = key.substring(PREFERENCES_COMMENT_PREFIX.length());
+ final Action action = actionBuilder.getAction(actionKey);
+ if (action == null || !isValidAction(action)) {
+ return null;
+ }
+
+ return actionBuilder.format("prefs.shortcut", ActionUtils.getActionName(action));
+ }
+
+ @Override
+ protected void removeSpi(final String key) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected void removeNodeSpi() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected String[] keysSpi() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected String[] childrenNamesSpi() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected AbstractPreferences childSpi(final String name) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected void syncSpi() {
+ // ignore
+ }
+
+ @Override
+ protected void flushSpi() {
+ // ignore
+ }
+
+ };
+ actionBuilder.addPref(commentPreferences);
+ }
+
+ /**
+ * Restores all shortcuts from the preferences.
+ */
+ public void loadShortcuts() {
+ for (final Action action : this) {
+ final String value = preferences.get(PREFERENCES_SHORTCUT_PREFIX + ActionUtils.getActionId(action), null);
+ if (value != null) {
+ if (value.equals(ActionUtils.NO_SHORTCUT)) {
+ action.putValue(Action.ACCELERATOR_KEY, null);
+ } else {
+ final Object acceleratorKey = KeyStroke.getKeyStroke(value);
+ if (acceleratorKey != null) {
+ action.putValue(Action.ACCELERATOR_KEY, acceleratorKey);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Saves all shortcuts to the preferences.
+ */
+ public void saveShortcuts() {
+ try {
+ for (final String key : preferences.keys()) {
+ if (key.startsWith(PREFERENCES_SHORTCUT_PREFIX)) {
+ preferences.remove(key);
+ }
+ }
+ } catch (final BackingStoreException ignored) {
+ // ignore: just keep excess keys
+ }
+
+ for (final Action action : this) {
+ final String acceleratorKey = ActionUtils.getShortcutDescription(action, Action.ACCELERATOR_KEY);
+ final String defaultAcceleratorKey = ActionUtils.getShortcutDescription(action, ActionUtils.DEFAULT_ACCELERATOR_KEY);
+ final String preferencesKey = PREFERENCES_SHORTCUT_PREFIX + ActionUtils.getActionId(action);
+ if (acceleratorKey.equals(defaultAcceleratorKey)) {
+ preferences.remove(preferencesKey);
+ } else {
+ preferences.put(preferencesKey, acceleratorKey);
+ }
+ }
+ }
+
+ /**
+ * Displays a dialog to edit shortcuts.
+ * @param parentComponent the parent component for the dialog
+ */
+ public void showShortcutsDialog(@NotNull final Component parentComponent) {
+ final ShortcutsDialog shortcutsDialog = new ShortcutsDialog(parentComponent, this);
+ shortcutsDialog.showDialog(parentComponent);
+ }
+
+ /**
+ * Reverts all shortcuts to their default values.
+ */
+ public void revertAll() {
+ for (final Action action : this) {
+ action.putValue(Action.ACCELERATOR_KEY, action.getValue(ActionUtils.DEFAULT_ACCELERATOR_KEY));
+ }
+ }
+
+ /**
+ * Returns all {@link Action Actions}.
+ * @return an iterator returning the actions
+ */
+ @Override
+ public Iterator<Action> iterator() {
+ final List<Action> result = new ArrayList<Action>();
+ final ActionMap actionMap = actionBuilder.getActionMap();
+ for (final Object key : actionMap.allKeys()) {
+ if (key instanceof String) {
+ final Action action = actionMap.get(key);
+ assert action != null;
+ if (isValidAction(action)) {
+ result.add(action);
+ }
+ }
+ }
+ Collections.sort(result, actionComparator);
+ return result.iterator();
+ }
+
+ /**
+ * Returns whether an {@link Action} is a global action.
+ * @param action the action to check
+ * @return whether the action is valid
+ */
+ private static boolean isValidAction(@NotNull final Action action) {
+ try {
+ ActionUtils.getActionId(action);
+ return true;
+ } catch (final IllegalArgumentException ignored) {
+ return false;
+ }
+ }
+
+} // class ShortcutsManager
Property changes on: trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-20 21:15:50 UTC (rev 7843)
@@ -104,6 +104,7 @@
import net.sf.gridarta.gui.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareModel;
import net.sf.gridarta.gui.selectedsquare.SelectedSquareView;
+import net.sf.gridarta.gui.shortcuts.ShortcutsManager;
import net.sf.gridarta.gui.spells.SpellsUtils;
import net.sf.gridarta.gui.treasurelist.CFTreasureListTree;
import net.sf.gridarta.gui.undo.UndoControl;
@@ -332,6 +333,12 @@
private final Exiter exiter;
/**
+ * The {@link ShortcutsManager} instance.
+ */
+ @NotNull
+ private final ShortcutsManager shortcutsManager;
+
+ /**
* Creates a new instance.
* @param createDirectionPane whether the direction panel should be created
* @param mapManager the map manager
@@ -470,7 +477,7 @@
final HelpActions helpActions = new HelpActions(mainViewFrame);
ActionUtils.newActions(ACTION_BUILDER, "Help", helpActions, "showHelp", "tipOfTheDay");
ActionUtils.newActions(ACTION_BUILDER, "Map", newMapDialogFactory, "newMap");
- ActionUtils.newActions(ACTION_BUILDER, "Tool", this, "cleanCompletelyBlockedSquares", "collectSpells", "controlClient", "controlServer", "gc", "options", "zoom");
+ ActionUtils.newActions(ACTION_BUILDER, "Tool", this, "cleanCompletelyBlockedSquares", "collectSpells", "controlClient", "controlServer", "gc", "options", "shortcuts", "zoom");
new MapCursorActions<G, A, R>(gameObjectAttributesDialogFactory, mapViewManager, selectedSquareControl, selectedSquareModel);
ActionUtils.newAction(ACTION_BUILDER, "Script", scriptEditControl, "newScript");
ActionUtils.newAction(ACTION_BUILDER, "Script", fileControl, "editScript");
@@ -568,6 +575,8 @@
}
new AutoValidator<G, A, R>(validators, autoValidatorDefault, delayedMapModelListenerManager);
mapManager.setFileControl(fileControl);
+ shortcutsManager = new ShortcutsManager(ACTION_BUILDER);
+ shortcutsManager.loadShortcuts();
delayedMapModelListenerManager.start();
}
@@ -617,6 +626,14 @@
}
/**
+ * The action method for "configure shortcuts".
+ */
+ @ActionMethod
+ public void shortcuts() {
+ shortcutsManager.showShortcutsDialog(mainViewFrame);
+ }
+
+ /**
* Invoked when user wants to exit from the program.
*/
@ActionMethod
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-20 20:45:43 UTC (rev 7842)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-20 21:15:50 UTC (rev 7843)
@@ -433,6 +433,32 @@
goLocationCoordinateOutOfRange.title=Illegal Value
goLocationCoordinateOutOfRange.message=Coordinate value is invalid.
+# The Configure Keyboard Shortcuts dialog
+shortcuts.title=Configure Keyboard Shortcuts
+shortcuts.allActions=All Actions
+shortcuts.defaultIcon=EmptySmallIcon
+shortcuts.borderAllActions=All Actions
+shortcuts.actionDescription=Action Description:
+shortcuts.shortcut=Shortcut:
+shortcuts.selectedAction=Selected Action
+shortcutsOkay.text=Ok
+shortcutsDefaults.text=Restore All Defaults
+shortcutsDefaults.shortdescription=Restore all shortcuts to their default values.
+shortcutsRestoreDefaults.title=Restore Shortcuts?
+shortcutsRestoreDefaults.message=Restore all shortcuts to their default values?\n\nNote that this operation cannot be reverted.
+shortcutsSetShortcut.text=Set Shortcut
+shortcutsSetShortcut.mnemonic=S
+shortcutsUnsetShortcut.text=Unset Shortcut
+shortcutsUnsetShortcut.mnemonic=U
+
+# The Select Key Stroke dialog (part of Configure Keyboard Shortcuts dialog)
+keyStroke.title=Select Key Stroke
+keyStroke.borderKeyStroke=Key Stroke
+keyStroke.borderConflicts=Conflicts
+keyStroke.borderConflictAssigned=Also assigned to {0} in category {1}.
+keyStrokeOkay.text=Ok
+keyStrokeCancel.text=Cancel
+
shrinkMapSizeDialogTitle=Shrink Map Size
shrinkMapSizeDialogLabel=Remove empty squares from:
shrinkMapSizeDialogEast.text=east border
@@ -661,6 +687,10 @@
options.longdescription=Shows the options dialog for changing editor settings.
options.accel=ctrl alt pressed S
+shortcuts.text=Configure Shortcuts...
+shortcuts.shortdescription=Shows the configure shortcuts dialog.
+shortcuts.longdescription=Shows the configure shortcuts dialog for changing keyboard shortcuts.
+
exit.text=Exit
exit.mnemonic=X
exit.shortdescription=Exits the editor.
@@ -1063,6 +1093,7 @@
prefs.ScriptEditWindow.width=Width of script editor.
prefs.ScriptEditWindow.x=X coordinate of script editor.
prefs.ScriptEditWindow.y=Y co...
[truncated message content] |
|
From: <aki...@us...> - 2010-05-20 20:45:50
|
Revision: 7842
http://gridarta.svn.sourceforge.net/gridarta/?rev=7842&view=rev
Author: akirschbaum
Date: 2010-05-20 20:45:43 +0000 (Thu, 20 May 2010)
Log Message:
-----------
Add categories to global actions.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java
trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java
trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java
trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
trunk/src/app/net/sf/gridarta/gui/misc/About.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/utils/ActionUtils.java
Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -39,6 +39,7 @@
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.CommonConstants;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -82,19 +83,19 @@
* The button for "display game object names".
*/
@NotNull
- private final AbstractButton buttonDisplayGameObjectNames = new JToggleButton(ACTION_BUILDER.createAction(true, "displayGameObjectNames", this));
+ private final AbstractButton buttonDisplayGameObjectNames = new JToggleButton(ActionUtils.newAction(ACTION_BUILDER, "Archetype Chooser", this, "displayGameObjectNames"));
/**
* The button for "display archetype names".
*/
@NotNull
- private final AbstractButton buttonDisplayArchetypeNames = new JToggleButton(ACTION_BUILDER.createAction(true, "displayArchetypeNames", this));
+ private final AbstractButton buttonDisplayArchetypeNames = new JToggleButton(ActionUtils.newAction(ACTION_BUILDER, "Archetype Chooser", this, "displayArchetypeNames"));
/**
* The button for "display icons only".
*/
@NotNull
- private final AbstractButton buttonDisplayIconsOnly = new JToggleButton(ACTION_BUILDER.createAction(true, "displayIconsOnly", this));
+ private final AbstractButton buttonDisplayIconsOnly = new JToggleButton(ActionUtils.newAction(ACTION_BUILDER, "Archetype Chooser", this, "displayIconsOnly"));
/**
* The archetype chooser model.
Modified: trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -35,6 +35,7 @@
import net.sf.gridarta.model.exitconnector.ExitLocation;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
@@ -62,19 +63,19 @@
* The action for "copy exit".
*/
@NotNull
- private final Action aExitCopy = ACTION_BUILDER.createAction(true, "exitCopy", this);
+ private final Action aExitCopy = ActionUtils.newAction(ACTION_BUILDER, "Exit Connector", this, "exitCopy");
/**
* The action for "paste exit".
*/
@NotNull
- private final Action aExitPaste = ACTION_BUILDER.createAction(true, "exitPaste", this);
+ private final Action aExitPaste = ActionUtils.newAction(ACTION_BUILDER, "Exit Connector", this, "exitPaste");
/**
* The action for "connect exits".
*/
@NotNull
- private final Action aExitConnect = ACTION_BUILDER.createAction(true, "exitConnect", this);
+ private final Action aExitConnect = ActionUtils.newAction(ACTION_BUILDER, "Exit Connector", this, "exitConnect");
/**
* The active {@link MapView} or <code>null</code> if no map view exists.
Modified: trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -153,8 +153,8 @@
final JPanel panel = new JPanel(new GridBagLayout());
nameField = new JTextField();
- addAction(nameField, ACTION_BUILDER.createAction(true, "findArchetypesScrollUp", this));
- addAction(nameField, ACTION_BUILDER.createAction(true, "findArchetypesScrollDown", this));
+ addAction(nameField, ACTION_BUILDER.createAction(false, "findArchetypesScrollUp", this));
+ addAction(nameField, ACTION_BUILDER.createAction(false, "findArchetypesScrollDown", this));
nameField.getDocument().addDocumentListener(documentListener);
resultTableModel = new TableModel<G, A, R>(archetypeTypeSet);
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -40,6 +40,7 @@
import net.sf.gridarta.model.map.mapmodel.MapModelListener;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.map.validation.ErrorCollector;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Size2D;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -94,31 +95,31 @@
* The action for "save map".
*/
@NotNull
- private final Action aSaveMap = ACTION_BUILDER.createAction(true, "saveMap", this);
+ private final Action aSaveMap = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "saveMap");
/**
* The action for "save map as".
*/
@NotNull
- private final Action aSaveMapAs = ACTION_BUILDER.createAction(true, "saveMapAs", this);
+ private final Action aSaveMapAs = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "saveMapAs");
/**
* The action for "create image".
*/
@NotNull
- private final Action aCreateImage = ACTION_BUILDER.createAction(true, "createImage", this);
+ private final Action aCreateImage = ActionUtils.newAction(ACTION_BUILDER, "Map,Image", this, "createImage");
/**
* The action for "revert map".
*/
@NotNull
- private final Action aRevertMap = ACTION_BUILDER.createAction(true, "revertMap", this);
+ private final Action aRevertMap = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "revertMap");
/**
* The action for "close map".
*/
@NotNull
- private final Action aCloseMap = ACTION_BUILDER.createAction(true, "closeMap", this);
+ private final Action aCloseMap = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "closeMap");
/**
* The currently tracked map, or <code>null</code> if no map is tracked.
Modified: trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursorActions.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -34,6 +34,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.CommonConstants;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -198,18 +199,18 @@
this.selectedSquareControl = selectedSquareControl;
this.selectedSquareModel = selectedSquareModel;
goLocationDialogManager = new GoLocationDialogManager<G, A, R>(mapViewManager);
- ACTION_BUILDER.createActions(true, this, directionsGo);
- aGoLocation = ACTION_BUILDER.createAction(true, "goLocation", this);
- aSelectSquare = ACTION_BUILDER.createAction(true, "selectSquare", this);
- aAddToSelection = ACTION_BUILDER.createAction(true, "addToSelection", this);
- aSubFromSelection = ACTION_BUILDER.createAction(true, "subFromSelection", this);
- aStartStopDrag = ACTION_BUILDER.createAction(true, "startStopDrag", this);
- aReleaseDrag = ACTION_BUILDER.createAction(true, "releaseDrag", this);
- aInsertArch = ACTION_BUILDER.createAction(true, "insertArch", this);
- aDeleteArch = ACTION_BUILDER.createAction(true, "deleteArch", this);
- aSelectArchAbove = ACTION_BUILDER.createAction(true, "selectArchAbove", this);
- aSelectArchBelow = ACTION_BUILDER.createAction(true, "selectArchBelow", this);
- aArchAttributes = ACTION_BUILDER.createAction(true, "archAttributes", this);
+ ActionUtils.newActions(ACTION_BUILDER, "Map Cursor/Move Cursor", this, directionsGo);
+ aGoLocation = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor", this, "goLocation");
+ aSelectSquare = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Map/Selection", this, "selectSquare");
+ aAddToSelection = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Map/Selection", this, "addToSelection");
+ aSubFromSelection = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Map/Selection", this, "subFromSelection");
+ aStartStopDrag = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Map/Selection", this, "startStopDrag");
+ aReleaseDrag = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Map/Selection", this, "releaseDrag");
+ aInsertArch = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Map", this, "insertArch");
+ aDeleteArch = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Map", this, "deleteArch");
+ aSelectArchAbove = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Selected Square View", this, "selectArchAbove");
+ aSelectArchBelow = ActionUtils.newAction(ACTION_BUILDER, "Map Cursor,Selected Square View", this, "selectArchBelow");
+ aArchAttributes = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "archAttributes");
mapViewManager.addMapViewManagerListener(mapViewManagerListener);
currentMapView = mapViewManager.getActiveMapView();
refreshActions();
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/DefaultMapActions.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -58,6 +58,7 @@
import net.sf.gridarta.model.map.normalizer.SameMapException;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.mapviewsettings.MapViewSettingsListener;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.CommonConstants;
import net.sf.gridarta.utils.Size2D;
import net.sf.japi.swing.action.ActionBuilder;
@@ -118,13 +119,13 @@
* Action for "create view".
*/
@NotNull
- private final Action aMapCreateView = ACTION_BUILDER.createAction(true, "mapCreateView", this);
+ private final Action aMapCreateView = ActionUtils.newAction(ACTION_BUILDER, "Map,Window", this, "mapCreateView");
/**
* Action for "map properties".
*/
@NotNull
- private final Action aMapProperties = ACTION_BUILDER.createAction(true, "mapProperties", this);
+ private final Action aMapProperties = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "mapProperties");
/**
* Action for "autojoin".
@@ -136,31 +137,31 @@
* Action for "shrink map size".
*/
@NotNull
- private final Action aShrinkMapSize = ACTION_BUILDER.createAction(true, "shrinkMapSize", this);
+ private final Action aShrinkMapSize = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "shrinkMapSize");
/**
* Action for "enter exit".
*/
@NotNull
- private final Action aEnterExit = ACTION_BUILDER.createAction(true, "enterExit", this);
+ private final Action aEnterExit = ActionUtils.newAction(ACTION_BUILDER, "Map Navigation", this, "enterExit");
/**
* Action for "next exit".
*/
@NotNull
- private final Action aNextExit = ACTION_BUILDER.createAction(true, "nextExit", this);
+ private final Action aNextExit = ActionUtils.newAction(ACTION_BUILDER, "Map Navigation", this, "nextExit");
/**
* Action for "previous exit".
*/
@NotNull
- private final Action aPrevExit = ACTION_BUILDER.createAction(true, "prevExit", this);
+ private final Action aPrevExit = ActionUtils.newAction(ACTION_BUILDER, "Map Navigation", this, "prevExit");
/**
* Action for "delete unknown objects".
*/
@NotNull
- private final Action aDeleteUnknownObjects = ACTION_BUILDER.createAction(true, "deleteUnknownObjects", this);
+ private final Action aDeleteUnknownObjects = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "deleteUnknownObjects");
/**
* Action for "enter xxx map".
@@ -170,7 +171,7 @@
{
for (int i = 0; i < directionsMap.length; i++) {
- aDirections[i] = ACTION_BUILDER.createAction(true, directionsMap[i], this);
+ aDirections[i] = ActionUtils.newAction(ACTION_BUILDER, "Map Navigation", this, directionsMap[i]);
}
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -33,6 +33,7 @@
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.mapviewsettings.MapViewSettingsListener;
import net.sf.gridarta.model.match.NamedGameObjectMatcher;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
@@ -148,7 +149,7 @@
*/
public ViewActions(@NotNull final MapViewSettings mapViewSettings, @NotNull final MapManager<G, A, R> mapManager) {
this.mapViewSettings = mapViewSettings;
- ACTION_BUILDER.createActions(true, this, "resetView");
+ ActionUtils.newAction(ACTION_BUILDER, "Map", this, "resetView");
mapManager.addMapManagerListener(mapManagerListener);
mapViewSettings.addMapViewSettingsListener(mapViewSettingsListener);
}
Modified: trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -42,6 +42,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
@@ -250,8 +251,8 @@
this.mapManager = mapManager;
this.mapImageCache = mapImageCache;
this.mapViewsManager = mapViewsManager;
- aPrevWindow = ACTION_BUILDER.createAction(true, "prevWindow", this);
- aNextWindow = ACTION_BUILDER.createAction(true, "nextWindow", this);
+ aPrevWindow = ActionUtils.newAction(ACTION_BUILDER, "Map,Window", this, "prevWindow");
+ aNextWindow = ActionUtils.newAction(ACTION_BUILDER, "Map,Window", this, "nextWindow");
mapManager.addMapManagerListener(mapManagerListener);
mapImageCache.addMapImageCacheListener(mapImageCacheListener);
updateFocus(false);
Modified: trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -31,6 +31,7 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
@@ -134,8 +135,8 @@
this.deleteFolderNotEmptyKey = deleteFolderNotEmptyKey;
mapFolderTree.addModelListener(mapFolderTreeListener);
activeMapFolder = mapFolderTree.getActiveMapFolder();
- ACTION_BUILDER.createAction(true, createFolderKey, this);
- aDeletePickmapFolder = ACTION_BUILDER.createAction(true, deleteFolderKey, this);
+ ActionUtils.newAction(ACTION_BUILDER, "Pickmap", this, createFolderKey);
+ aDeletePickmapFolder = ActionUtils.newAction(ACTION_BUILDER, "Pickmap", this, deleteFolderKey);
refresh();
}
Modified: trunk/src/app/net/sf/gridarta/gui/misc/About.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/misc/About.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/misc/About.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -21,6 +21,7 @@
import java.awt.Component;
import java.lang.ref.WeakReference;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.japi.swing.about.AboutDialog;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -64,7 +65,7 @@
*/
public About(@NotNull final Component parent) {
this.parent = parent;
- ACTION_BUILDER.createAction(true, "about", this);
+ ActionUtils.newAction(ACTION_BUILDER, "Help", this, "about");
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -59,6 +59,7 @@
import net.sf.gridarta.model.map.mapmodel.MapModelListener;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.map.validation.ErrorCollector;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Size2D;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -154,27 +155,27 @@
/**
* Action called for "add new pickmap".
*/
- private final Action aAddNewPickmap = ACTION_BUILDER.createAction(true, "addNewPickmap", this);
+ private final Action aAddNewPickmap = ActionUtils.newAction(ACTION_BUILDER, "Pickmap", this, "addNewPickmap");
/**
* Action called for "open active pickmap as map".
*/
- private final Action aOpenPickmapMap = ACTION_BUILDER.createAction(true, "openPickmapMap", this);
+ private final Action aOpenPickmapMap = ActionUtils.newAction(ACTION_BUILDER, "Pickmap", this, "openPickmapMap");
/**
* Action called for "delete active pickmap".
*/
- private final Action aDeletePickmap = ACTION_BUILDER.createAction(true, "deletePickmap", this);
+ private final Action aDeletePickmap = ActionUtils.newAction(ACTION_BUILDER, "Pickmap", this, "deletePickmap");
/**
* Action called for "save active pickmap".
*/
- private final Action aSavePickmap = ACTION_BUILDER.createAction(true, "savePickmap", this);
+ private final Action aSavePickmap = ActionUtils.newAction(ACTION_BUILDER, "Pickmap", this, "savePickmap");
/**
* Action called for "revert active pickmap".
*/
- private final Action aRevertPickmap = ACTION_BUILDER.createAction(true, "revertPickmap", this);
+ private final Action aRevertPickmap = ActionUtils.newAction(ACTION_BUILDER, "Pickmap", this, "revertPickmap");
/**
* The parent component for error messages.
Modified: trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -45,6 +45,7 @@
import net.sf.gridarta.script.ScriptParameters;
import net.sf.gridarta.script.ScriptRunMode;
import net.sf.gridarta.script.parameter.PluginParameterFactory;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.FileChooserUtils;
import net.sf.gridarta.utils.SystemIcons;
import net.sf.japi.swing.action.ActionBuilder;
@@ -169,7 +170,8 @@
scriptModelParser = new ScriptModelParser<G, A, R>(pluginParameterFactory);
scriptModelLoader = new ScriptModelLoader<G, A, R>(scriptModelParser);
new ScriptManagerFactory<G, A, R>(this, scriptModel, pluginParameterViewFactory, pluginParameterFactory, systemIcons);
- ACTION_BUILDER.createActions(true, this, "savePlugins", "importPlugin");
+ ActionUtils.newAction(ACTION_BUILDER, "Plugin", this, "savePlugins");
+ ActionUtils.newAction(ACTION_BUILDER, "Plugin", this, "importPlugin");
view = new ScriptView<G, A, R>(this, scriptModel, pluginParameterViewFactory, systemIcons);
scriptModel.addScriptModelListener(scriptModelListener);
}
@@ -363,7 +365,7 @@
*/
@NotNull
public Action createRunAction(@NotNull final Script<G, A, R> script) {
- final Action action = ACTION_BUILDER.createAction(true, "runPlugin", this);
+ final Action action = ActionUtils.newAction(ACTION_BUILDER, "Plugin", this, "runPlugin");
action.putValue(ReflectionAction.REFLECTION_ARGUMENTS, new Object[] { script.getName(), });
action.putValue(Action.NAME, ACTION_BUILDER.format("runPlugin.text", script.getName()));
return action;
Modified: trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -26,6 +26,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.script.ScriptModel;
import net.sf.gridarta.script.parameter.PluginParameterFactory;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.SystemIcons;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -71,7 +72,7 @@
this.pluginParameterViewFactory = pluginParameterViewFactory;
this.pluginParameterFactory = pluginParameterFactory;
this.systemIcons = systemIcons;
- ACTION_BUILDER.createActions(true, this, "editPlugins");
+ ActionUtils.newAction(ACTION_BUILDER, "Plugin", this, "editPlugins");
}
@ActionMethod
Modified: trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -43,6 +43,7 @@
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
@@ -99,37 +100,37 @@
* The action for "move square top".
*/
@NotNull
- private final Action aMoveSquareTop = ACTION_BUILDER.createAction(true, "moveSquareTop", this);
+ private final Action aMoveSquareTop = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquareTop");
/**
* The action for "move square up".
*/
@NotNull
- private final Action aMoveSquareUp = ACTION_BUILDER.createAction(true, "moveSquareUp", this);
+ private final Action aMoveSquareUp = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquareUp");
/**
* The action for "move square down".
*/
@NotNull
- private final Action aMoveSquareDown = ACTION_BUILDER.createAction(true, "moveSquareDown", this);
+ private final Action aMoveSquareDown = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquareDown");
/**
* The action for "move square bottom".
*/
@NotNull
- private final Action aMoveSquareBottom = ACTION_BUILDER.createAction(true, "moveSquareBottom", this);
+ private final Action aMoveSquareBottom = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquareBottom");
/**
* The action for "move square env".
*/
@NotNull
- private final Action aMoveSquareEnv = ACTION_BUILDER.createAction(true, "moveSquareEnv", this);
+ private final Action aMoveSquareEnv = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquareEnv");
/**
* The action for "move square inv".
*/
@NotNull
- private final Action aMoveSquareInv = ACTION_BUILDER.createAction(true, "moveSquareInv", this);
+ private final Action aMoveSquareInv = ActionUtils.newAction(ACTION_BUILDER, "Selected Square View", this, "moveSquareInv");
/**
* The {@link MouseListener} attached to the view to process mouse actions.
Modified: trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -49,6 +49,7 @@
import net.sf.gridarta.model.treasurelist.FolderTreasureObj;
import net.sf.gridarta.model.treasurelist.TreasureTree;
import net.sf.gridarta.model.treasurelist.TreasureTreeNode;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.SystemIcons;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -121,7 +122,7 @@
putClientProperty("JTree.lineStyle", "Angled");
setCellRenderer(new TreasureCellRenderer<G, A, R>(archetypeSet, treasureTree.getRoot(), faceObjectProviders, systemIcons));
- ACTION_BUILDER.createAction(true, "viewTreasurelists", this);
+ ActionUtils.newAction(ACTION_BUILDER, "Tool", this, "viewTreasurelists");
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -35,6 +35,7 @@
import net.sf.gridarta.model.match.GameObjectMatchers;
import net.sf.gridarta.model.undo.UndoModel;
import net.sf.gridarta.model.undo.UndoState;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
import net.sf.japi.swing.action.ActionMethod;
@@ -185,12 +186,12 @@
/**
* Action for "undo" function.
*/
- private final Action aUndo = ACTION_BUILDER.createAction(true, "undo", this);
+ private final Action aUndo = ActionUtils.newAction(ACTION_BUILDER, "Undo", this, "undo");
/**
* Action for "redo" function.
*/
- private final Action aRedo = ACTION_BUILDER.createAction(true, "redo", this);
+ private final Action aRedo = ActionUtils.newAction(ACTION_BUILDER, "Undo", this, "redo");
/**
* Create a new instance.
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -59,6 +59,7 @@
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.resource.AbstractResources;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Exiter;
import net.sf.gridarta.utils.ExiterListener;
import net.sf.gridarta.utils.Size2D;
@@ -532,30 +533,30 @@
this.faceObjectProviders = faceObjectProviders;
this.gameObjectFactory = gameObjectFactory;
this.insertionModeSet = insertionModeSet;
- aClear = ACTION_BUILDER.createAction(true, "clear", this);
- aCut = ACTION_BUILDER.createAction(true, "cut", this);
- aCopy = ACTION_BUILDER.createAction(true, "copy", this);
- aPaste = ACTION_BUILDER.createAction(true, "paste", this);
- aShiftNorth = ACTION_BUILDER.createAction(true, "shiftNorth", this);
- aShiftNorthEast = ACTION_BUILDER.createAction(true, "shiftNorthEast", this);
- aShiftEast = ACTION_BUILDER.createAction(true, "shiftEast", this);
- aShiftSouthEast = ACTION_BUILDER.createAction(true, "shiftSouthEast", this);
- aShiftSouth = ACTION_BUILDER.createAction(true, "shiftSouth", this);
- aShiftSouthWest = ACTION_BUILDER.createAction(true, "shiftSouthWest", this);
- aShiftWest = ACTION_BUILDER.createAction(true, "shiftWest", this);
- aShiftNorthWest = ACTION_BUILDER.createAction(true, "shiftNorthWest", this);
- aReplace = ACTION_BUILDER.createAction(true, "replace", this);
- aFillAuto = ACTION_BUILDER.createAction(true, "fillAuto", this);
- aFillAbove = ACTION_BUILDER.createAction(true, "fillAbove", this);
- aFillBelow = ACTION_BUILDER.createAction(true, "fillBelow", this);
- aRandFillAuto = ACTION_BUILDER.createAction(true, "randFillAuto", this);
- aRandFillAbove = ACTION_BUILDER.createAction(true, "randFillAbove", this);
- aRandFillBelow = ACTION_BUILDER.createAction(true, "randFillBelow", this);
- aFloodfill = ACTION_BUILDER.createAction(true, "floodfill", this);
- aSelectAll = ACTION_BUILDER.createAction(true, "selectAll", this);
- aCollectArches = ACTION_BUILDER.createAction(true, "collectArches", this);
- aReloadFaces = ACTION_BUILDER.createAction(true, "reloadFaces", this);
- aValidateMap = ACTION_BUILDER.createAction(true, "validateMap", this);
+ aClear = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "clear");
+ aCut = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "cut");
+ aCopy = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "copy");
+ aPaste = ActionUtils.newAction(ACTION_BUILDER, "Copy Buffer", this, "paste");
+ aShiftNorth = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftNorth");
+ aShiftNorthEast = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftNorthEast");
+ aShiftEast = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftEast");
+ aShiftSouthEast = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftSouthEast");
+ aShiftSouth = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftSouth");
+ aShiftSouthWest = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftSouthWest");
+ aShiftWest = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftWest");
+ aShiftNorthWest = ActionUtils.newAction(ACTION_BUILDER, "Map/Shift", this, "shiftNorthWest");
+ aReplace = ActionUtils.newAction(ACTION_BUILDER, "Map", this, "replace");
+ aFillAuto = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "fillAuto");
+ aFillAbove = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "fillAbove");
+ aFillBelow = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "fillBelow");
+ aRandFillAuto = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "randFillAuto");
+ aRandFillAbove = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "randFillAbove");
+ aRandFillBelow = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "randFillBelow");
+ aFloodfill = ActionUtils.newAction(ACTION_BUILDER, "Map/Fill", this, "floodfill");
+ aSelectAll = ActionUtils.newAction(ACTION_BUILDER, "Map/Selection", this, "selectAll");
+ aCollectArches = ActionUtils.newAction(ACTION_BUILDER, "Tool", this, "collectArches");
+ aReloadFaces = ActionUtils.newAction(ACTION_BUILDER, "Image,Tool", this, "reloadFaces");
+ aValidateMap = ActionUtils.newAction(ACTION_BUILDER, "Map,Tool", this, "validateMap");
mapManager.addMapManagerListener(mapManagerListener);
currentMapControl = mapManager.getCurrentMap();
mapViewManager.addMapViewManagerListener(mapViewManagerListener);
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -165,6 +165,7 @@
import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
import net.sf.gridarta.textedit.textarea.TextAreaDefaults;
import net.sf.gridarta.updater.UpdaterManager;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Exiter;
import net.sf.gridarta.utils.ProcessRunner;
import net.sf.gridarta.utils.SystemIcons;
@@ -460,22 +461,23 @@
final GameObjectAttributesTab<G, A, R> textEditorTab = new TextEditorTab<G, A, R>(gameObjectAttributesModel, archetypeTypeSet);
final GameObjectTab<G, A, R> gameObjectTab = new GameObjectTab<G, A, R>("gameObject", gameObjectAttributesControl, Location.BOTTOM, 0, true);
- final Action exitAction = ACTION_BUILDER.createAction(true, "exit", this);
+ final Action exitAction = ActionUtils.newAction(ACTION_BUILDER, "Other", this, "exit");
final MapFolderTreeActions<G, A, R> mapFolderTreeActions = new MapFolderTreeActions<G, A, R>(mapFolderTree, newMapDialogFactory, "createPickmapFolder", "deletePickmapFolder", "confirmDeletePickmapFolder", "deletePickmapFolderNotEmpty");
new DefaultMapActions<G, A, R>(mainViewFrame, mainViewFrame, mapManager, mapViewManager, exitMatcher, FileFilters.mapFileFilter, selectedSquareModel, directionMap, allowRandomMapParameters, mapPropertiesDialogFactory, mapViewSettings, mapPathNormalizer, mapViewsManager, fileControl);
final ViewActions<G, A, R> viewActions = new ViewActions<G, A, R>(mapViewSettings, mapManager);
new MapFileActions<G, A, R>(imageCreator2, mapManager, mapViewsManager, mapViewManager, fileControl, mainViewFrame);
new MainActions<G, A, R>(replaceDialogManager, mainViewFrame, globalSettings, validators, mapViewSettings, archetypeSet, copyBuffer, copyBufferMapModel, objectChooser, mapManager, mapViewManager, resources, faceObjectProviders, gameObjectFactory, insertionModeSet, exiter);
final HelpActions helpActions = new HelpActions(mainViewFrame);
- ACTION_BUILDER.createActions(true, helpActions, "showHelp", "tipOfTheDay");
- ACTION_BUILDER.createActions(true, newMapDialogFactory, "newMap");
- ACTION_BUILDER.createActions(true, this, "cleanCompletelyBlockedSquares", "collectSpells", "controlClient", "controlServer", "gc", "options", "zoom");
+ ActionUtils.newActions(ACTION_BUILDER, "Help", helpActions, "showHelp", "tipOfTheDay");
+ ActionUtils.newActions(ACTION_BUILDER, "Map", newMapDialogFactory, "newMap");
+ ActionUtils.newActions(ACTION_BUILDER, "Tool", this, "cleanCompletelyBlockedSquares", "collectSpells", "controlClient", "controlServer", "gc", "options", "zoom");
new MapCursorActions<G, A, R>(gameObjectAttributesDialogFactory, mapViewManager, selectedSquareControl, selectedSquareModel);
- ACTION_BUILDER.createActions(true, scriptEditControl, "newScript");
- ACTION_BUILDER.createActions(true, fileControl, "editScript", "openFile", "saveAllMaps");
- final Action aCloseAllMaps = ACTION_BUILDER.createAction(true, "closeAllMaps", fileControl);
+ ActionUtils.newAction(ACTION_BUILDER, "Script", scriptEditControl, "newScript");
+ ActionUtils.newAction(ACTION_BUILDER, "Script", fileControl, "editScript");
+ ActionUtils.newActions(ACTION_BUILDER, "Map", fileControl, "openFile", "saveAllMaps");
+ final Action aCloseAllMaps = ActionUtils.newAction(ACTION_BUILDER, "Map,Window", fileControl, "closeAllMaps");
mainView = new MainView(mainViewFrame, exitAction, mapDesktop, icon, exiter);
- ACTION_BUILDER.createActions(true, new MainViewActions<G, A, R>(mainView, gameObjectAttributesControl, gameObjectTab, textEditorTab), "gameObjectTextEditor");
+ ActionUtils.newAction(ACTION_BUILDER, "Tool", new MainViewActions<G, A, R>(mainView, gameObjectAttributesControl, gameObjectTab, textEditorTab), "gameObjectTextEditor");
pickmapChooserControl.setPopupMenu(ACTION_BUILDER.createPopupMenu(true, "pickmaps"));
final JMenuBar menuBar = ACTION_BUILDER.createMenuBar(true, "main");
Modified: trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2010-05-20 20:22:28 UTC (rev 7841)
+++ trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -24,6 +24,7 @@
import javax.swing.Action;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.mapmanager.MapManager;
+import net.sf.gridarta.utils.ActionUtils;
import net.sf.gridarta.utils.Exiter;
import net.sf.japi.swing.action.ActionBuilder;
import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -108,7 +109,7 @@
this.exiter = exiter;
this.parentComponent = parentComponent;
this.updateFileName = updateFileName;
- final Action aUpdate = ACTION_BUILDER.createAction(true, "update", this);
+ final Action aUpdate = ActionUtils.newAction(ACTION_BUILDER, "Tool", this, "update");
final CharSequence propUrl = ACTION_BUILDER.getString("update.url");
aUpdate.setEnabled(propUrl != null && propUrl.length() > 0);
Added: trunk/src/app/net/sf/gridarta/utils/ActionUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/utils/ActionUtils.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/utils/ActionUtils.java 2010-05-20 20:45:43 UTC (rev 7842)
@@ -0,0 +1,108 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.utils;
+
+import javax.swing.Action;
+import net.sf.japi.swing.action.ActionBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Utility class implementing {@link Action} related functions.
+ * @author Andreas Kirschbaum
+ */
+public class ActionUtils {
+
+ /**
+ * Action key for the action's category.
+ */
+ @NotNull
+ public static final String CATEGORY = "Category";
+
+ /**
+ * Category value for {@link Action Actions} not defining a {@link
+ * #CATEGORY}.
+ */
+ @NotNull
+ private static final String UNDEFINED_CATEGORY = "Other";
+
+ /**
+ * Private construct to prevent instantiation.
+ */
+ private ActionUtils() {
+ }
+
+ /**
+ * Returns an {@link Action}'s value as a string.
+ * @param action the action
+ * @param key the key to query
+ * @return the value as a string or <code>null</code> if no such key is
+ * defined of if the value is not a string
+ */
+ @Nullable
+ private static String getStringValue(@NotNull final Action action, @NotNull final String key) {
+ final Object value = action.getValue(key);
+ return value != null && value instanceof String ? (String) value : null;
+
+ }
+
+ /**
+ * Creates new {@link Action} instances. Calls {@link
+ * #newAction(ActionBuilder,String,Object,String)} for all keys.
+ * @param actionBuilder the action builder to use
+ * @param category the category to set
+ * @param object the object which defines the action method
+ * @param keys the actions' keys
+ */
+ public static void newActions(@NotNull final ActionBuilder actionBuilder, @NotNull final String category, @NotNull final Object object, @NotNull final String... keys) {
+ for (final String key : keys) {
+ newAction(actionBuilder, category, object, key);
+ }
+ }
+
+ /**
+ * Creates a new {@link Action} instance. It is basically the same as
+ * {@link ActionBuilder#createAction(boolean,String,Object)} except that
+ * the category is set.
+ * @param actionBuilder the action builder to use
+ * @param category the category to set
+ * @param object the object which defines the action method
+ * @param key the action's key
+ * @return the new action
+ */
+ @NotNull
+ public static Action newAction(@NotNull final ActionBuilder actionBuilder, @NotNull final String category, @NotNull final Object object, @NotNull final String key) {
+ final Action action = actionBuilder.createAction(true, key, object);
+ action.putValue(CATEGORY, category);
+ return action;
+ }
+
+ /**
+ * Returns an {@link Action}'s category.
+ * @param action the action
+ * @return the category
+ */
+ @NotNull
+ public static String getActionCategory(@NotNull final Action action) {
+ final String category = getStringValue(action, CATEGORY);
+ return category == null ? UNDEFINED_CATEGORY : category;
+ }
+
+} // class ActionUtils
Property changes on: trunk/src/app/net/sf/gridarta/utils/ActionUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-20 20:22:35
|
Revision: 7841
http://gridarta.svn.sourceforge.net/gridarta/?rev=7841&view=rev
Author: akirschbaum
Date: 2010-05-20 20:22:28 +0000 (Thu, 20 May 2010)
Log Message:
-----------
Do not store local Actions in ActionBuilder.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java 2010-05-19 17:15:11 UTC (rev 7840)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java 2010-05-20 20:22:28 UTC (rev 7841)
@@ -231,7 +231,7 @@
* @param y the y-position of the button
*/
private void createButton(final int direction, final Container panel, final GridBagConstraints gbc, final int x, final int y) {
- final JToggleButton button = new JToggleButton(ACTION_BUILDER.createAction(true, "direction" + direction, this));
+ final JToggleButton button = new JToggleButton(ACTION_BUILDER.createAction(false, "direction" + direction, this));
directionButtonGroup.add(button);
button.setFocusable(false);
button.setEnabled(false);
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2010-05-19 17:15:11 UTC (rev 7840)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2010-05-20 20:22:28 UTC (rev 7841)
@@ -227,11 +227,11 @@
gbc.weighty = 1.0;
if (canAttachMaps) {
gbc.anchor = GridBagConstraints.EAST;
- subPanel.add(new JButton(ACTION_BUILDER.createAction(true, "mapTilesAttach", this)), gbc);
+ subPanel.add(new JButton(ACTION_BUILDER.createAction(false, "mapTilesAttach", this)), gbc);
}
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.anchor = canAttachMaps ? GridBagConstraints.WEST : GridBagConstraints.CENTER;
- subPanel.add(new JButton(ACTION_BUILDER.createAction(true, "mapTilesClear", this)), gbc);
+ subPanel.add(new JButton(ACTION_BUILDER.createAction(false, "mapTilesClear", this)), gbc);
return subPanel;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-19 17:15:17
|
Revision: 7840
http://gridarta.svn.sourceforge.net/gridarta/?rev=7840&view=rev
Author: akirschbaum
Date: 2010-05-19 17:15:11 +0000 (Wed, 19 May 2010)
Log Message:
-----------
Fix incorrect resource keys.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-18 22:31:33 UTC (rev 7839)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-19 17:15:11 UTC (rev 7840)
@@ -838,7 +838,7 @@
about.text=About...
about.mnemonic=A
-abort.shortdescription=Displays information about Gridarta.
+about.shortdescription=Displays information about Gridarta.
aboutTab.title=About
aboutRuntimeProperties.title=Runtime properties
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-18 22:31:33 UTC (rev 7839)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-19 17:15:11 UTC (rev 7840)
@@ -782,7 +782,7 @@
about.text=\xDCber...
about.mnemonic=B
-abort.shortdescription=Zeigt Informationen \xFCber Gridarta an.
+about.shortdescription=Zeigt Informationen \xFCber Gridarta an.
aboutTab.title=\xDCber
aboutRuntimeProperties.title=Laufzeitparameter
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-18 22:31:40
|
Revision: 7839
http://gridarta.svn.sourceforge.net/gridarta/?rev=7839&view=rev
Author: akirschbaum
Date: 2010-05-18 22:31:33 +0000 (Tue, 18 May 2010)
Log Message:
-----------
Add tooltip texts and long descriptions for all actions.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-18 20:05:51 UTC (rev 7838)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-18 22:31:33 UTC (rev 7839)
@@ -41,22 +41,31 @@
cursor.mnemonic=C
moveCursor.text=Move Cursor
+moveCursor.shortdescription=Moves the map cursor.
goNorth.text=Move Cursor North
+goNorth.shortdescription=Moves the map cursor north.
goNorthEast.text=Move Cursor Northeast
+goNorthEast.shortdescription=Moves the map cursor north east.
goEast.text=Move Cursor East
+goEast.shortdescription=Moves the map cursor east.
goSouthEast.text=Move Cursor Southeast
+goSouthEast.shortdescription=Moves the map cursor south east.
goSouth.text=Move Cursor South
+goSouth.shortdescription=Moves the map cursor south.
goSouthWest.text=Move Cursor Southwest
+goSouthWest.shortdescription=Moves the map cursor south west.
goWest.text=Move Cursor West
+goWest.shortdescription=Moves the map cursor west.
goNorthWest.text=Move Cursor Northwest
+goNorthWest.shortdescription=Moves the map cursor north west.
#######
# Map
@@ -66,75 +75,94 @@
goLocation.text=Goto Location
goLocation.mnemonic=L
+goLocation.shortdescription=Opens the goto location dialog.
goLocation.accel=ctrl pressed L
selectSquare.text=Select square
+selectSquare.shortdescription=Selects the map cursor square.
selectSquare.accel=NUMPAD5
startStopDrag.text=Start/Stop dragging
+startStopDrag.shortdescription=Starts/stops dragging new selection.
startStopDrag.accel=SPACE
addToSelection.text=Add to selection
+addToSelection.shortdescription=Adds new selection to existing selection.
addToSelection.accel=ADD
subFromSelection.text=Sub from selection
+subFromSelection.shortdescription=Removes new selection from existing selection.
subFromSelection.accel=SUBTRACT
releaseDrag.text=Release Selection
+releaseDrag.shortdescription=Releases new selection.
releaseDrag.accel=BACK_SPACE
insertArch.text=Insert Object
+insertArch.shortdescription=Inserts a new game object from the object chooser.
insertArch.accel=NUMPAD0
deleteArch.text=Delete Object
+deleteArch.shortdescription=Deletes the selected game object.
deleteArch.accel=DECIMAL
selectArchAbove.text=Select Object above
+selectArchAbove.shortdescription=Selects the game object above the currently selected game object.
selectArchAbove.accel=DIVIDE
selectArchBelow.text=Select Object below
+selectArchBelow.shortdescription=Selects the game object below the currently selected game object.
selectArchBelow.accel=MULTIPLY
archAttributes.text=Object Attributes
+archAttributes.shortdescription=Opens the game object attributes dialog.
archAttributes.accel=ENTER
# Map Manager
-closeAllMaps.text=Close All
-closeAllMaps.shortdescription=Close all maps
-closeAllMaps.longdescription=Closes all opened maps
+closeAllMaps.text=Close All Maps
closeAllMaps.mnemonic=L
+closeAllMaps.shortdescription=Closes all open maps.
+closeAllMaps.longdescription=Closes all open maps. Asks for confirmation before closing modified maps.
closeAllMaps.accel=ctrl shift pressed W
-saveAllMaps.text=Save All
-saveAllMaps.shortdescription=Save all maps
-saveAllMaps.longdescription=Saves all opened maps
+saveAllMaps.text=Save All Maps
+saveAllMaps.shortdescription=Saves all modified maps.
gridVisible.text=Show Grid
gridVisible.mnemonic=G
-gridVisible.shortdescription=Draw a grid that shows the individual map squares
+gridVisible.shortdescription=Draws a grid that shows the individual map squares.
gridVisible.accel=ctrl pressed G
smoothing.text=Show Smoothing
smoothing.mnemonic=S
-smoothing.shortdescription=Hide square borders by smearing faces into adjacent squares
+smoothing.shortdescription=Hides square borders by smearing faces into adjacent squares.
tileShow.text=Show adjacent tiled maps
+tileShow.shortdescription=Shows adjacent tiled maps.
mapCreateView.text=Create View
+mapCreateView.shortdescription=Creates a new map view.
+mapCreateView.longdescription=Creates a new view for the current map. All views display the same map; map modifications affect all views.
mapProperties.text=Map Properties
mapProperties.mnemonic=M
+mapProperties.shortdescription=Opens the map properties dialog.
+mapProperties.longdescription=Opens the map properties dialog for the current map.
mapProperties.accel=ctrl pressed M
shrinkMapSize.text=Shrink Map Size...
-shrinkMapSize.shortdescription=Remove empty squares at right or bottom map border
+shrinkMapSize.shortdescription=Removes empty squares from the right or bottom map borders.
autoJoin.text=Autojoin
autoJoin.mnemonic=J
+autoJoin.shortdescription=Toggles autojoining of wall game objects.
+autoJoin.longdescription=Toggles autojoining of wall game objects when inserted into or deleted from maps.
enterExit.text=Enter Exit
enterExit.mnemonic=E
+enterExit.shortdescription=Opens the map the exit in the map cursor square.
+enterExit.longdescription=Opens the map the exit in the map cursor square. Prefers the selected game object in the selected square view, or the top-most exit game object on the map cursor square.
enterExitIOException.title=Invalid path
enterExitIOException.message=Failed to load file for path.\n{0}
@@ -151,69 +179,96 @@
nextExit.text=Next Exit
nextExit.mnemonic=N
+nextExit.shortdescription=Selects the next exit game object.
+nextExit.longdescription=Selects the next exit game object. Starts searching from the map cursor square or, if no map cursor is active, from the top left corner.
nextExit.accel=ctrl shift pressed E
prevExit.text=Previous Exit
prevExit.mnemonic=P
+prevExit.shortdescription=Selects the previous exit game object.
+prevExit.longdescription=Selects the previous exit game object. Starts searching from the map cursor square or, if no map cursor is active, from the bottom right corner.
exitConnector.text=Connect Exits
exitConnector.mnemonic=C
+exitConnector.shortdescription=Creates or updates exit game objects.
exitCopy.text=Copy Exit
exitCopy.mnemonic=C
+exitCopy.shortdescription=Copies the map cursor square as the exit location.
exitCopy.accel=ctrl shift pressed C
exitPaste.text=Paste Exit
exitPaste.mnemonic=P
+exitPaste.shortdescription=Pastes the exit location into the map cursor square.
+exitPaste.longdescription=Pastes a previously copied exit location into the map cursor square. An existing exit game object is updated; otherwise a new exit game object is created.
exitPaste.accel=ctrl shift pressed V
exitConnect.text=Connect Exits
exitConnect.mnemonic=O
+exitConnect.shortdescription=Bidirectionally connects the exit location with the map cursor square.
+exitConnect.longdescription=Bidirectionally connects the previously copied exit location with the cursor map square. Existing exit game objects are updated; otherwise new exit game objects are created.
exitConnect.accel=ctrl shift pressed Y
enterNorthMap.text=Enter North Map
+enterNorthMap.shortdescription=Opens the tiled map north of the current map.
enterNorthEastMap.text=Enter Northeast Map
+enterNorthEastMap.shortdescription=Opens the tiled map north east of the current map.
enterEastMap.text=Enter East Map
+enterEastMap.shortdescription=Opens the tiled map east of the current map.
enterSouthEastMap.text=Enter Southeast Map
+enterSouthEastMap.shortdescription=Opens the tiled map south east of the current map.
enterSouthMap.text=Enter South Map
+enterSouthMap.shortdescription=Opens the tiled map south of the current map.
enterSouthWestMap.text=Enter Southwest Map
+enterSouthWestMap.shortdescription=Opens the tiled map south west of the current map.
enterWestMap.text=Enter West Map
+enterWestMap.shortdescription=Opens the tiled map west of the current map.
enterNorthWestMap.text=Enter Northwest Map
+enterNorthWestMap.shortdescription=Opens the tiled map north west of the current map.
deleteUnknownObjects.text=Delete unknown objects
+deleteUnknownObjects.shortdescription=Deletes game objects referring to undefined archetypes from the current map.
gameObjectTextEditor.text=Toggle Game Object Text Editor
+gameObjectTextEditor.shortdescription=Toggles the game object text editor.
+gameObjectTextEditor.longdescription=Toggles the game object text editor: activates it if currently inactive or otherwise restores the previously active tab.
gameObjectTextEditor.accel=ctrl alt pressed E
# Plugins
plugins.text=Plugins
+plugins.mnemonic=L
plugins.shortdescription=Manage and use beanshell plugins
-plugins.mnemonic=L
editPlugins.text=Edit plugins...
editPlugins.mnemonic=E
+editPlugins.shortdescription=Opens the plugin script editor.
runPlugin.text=Run {0}
+runPlugin.shortdescription=Executes the plugin script.
savePlugins.text=Save plugins
savePlugins.mnemonic=S
+savePlugins.shortdescription=Saves all modified plugin scripts.
importPlugin.text=Import a plugin...
importPlugin.mnemonic=I
+importPlugin.shortdescription=Imports a plugin script from an XML file.
# Resources
viewTreasurelists.text=View Treasurelists
viewTreasurelists.mnemonic=T
+viewTreasurelists.shortdescription=Opens the treasurelist dialog.
collectSpells.text=Collect Spells
collectSpells.mnemonic=S
+collectSpells.shortdescription=Updates defined spells from a file.
# Zoom
@@ -370,7 +425,7 @@
goLocationOkay.text=Ok
goLocationApply.text=Apply
goLocationCancel.text=Cancel
-goLocationText=Move cursor in map {0} to:
+goLocationText=Move map cursor in map {0} to:
goLocationX=X coordinate:
goLocationY=Y coordinate:
goLocationCoordinateNotANumber.title=Illegal Value
@@ -538,16 +593,14 @@
# Edit
undo.text=Undo
undo.name=Undo {0}
-undo.shortdescription=Undo last action
-undo.longdescription=Undoes the last action if possible
undo.mnemonic=U
+undo.shortdescription=Undoes the last action.
undo.accel=ctrl pressed Z
redo.text=Redo
redo.name=Redo {0}
-redo.shortdescription=Redo last undo action
-redo.longdescription=Redoes the last undone action if possible
redo.mnemonic=E
+redo.shortdescription=Redoes the last undo action.
redo.accel=ctrl pressed Y
@@ -557,67 +610,61 @@
file.text=File
file.mnemonic=F
-saveMap.text=Save
-saveMap.shortdescription=Save map
-saveMap.longdescription=Saves the current map
+saveMap.text=Save Map
saveMap.mnemonic=S
+saveMap.shortdescription=Saves the current map if modified.
saveMap.accel=ctrl pressed S
saveMap.error.text.title=Error while saving
saveMap.error.text=Error while saving:\n{0}
-saveMapAs.text=Save As...
-saveMapAs.shortdescription=Save map with new name
-saveMapAs.longdescription=Saves map with a new filename
+saveMapAs.text=Save Map As...
saveMapAs.mnemonic=A
+saveMapAs.shortdescription=Saves the current map with a new name.
saveMapAs.accel=ctrl shift pressed S
saveMapAs.error.text=Error while saving as
-createImage.text=Create Image
-createImage.shortdescription=Creates a snapshot
-createImage.longdescription=Creates a snapshot image and saves it to a file
+createImage.text=Create Map Image
createImage.mnemonic=I
+createImage.shortdescription=Saves an image of the current map to a file.
createImage.error.text=Error while creating snapshot image
-revertMap.text=Revert
-revertMap.shortdescription=Reverts map
-revertMap.longdescription=Reverts the map to the last saved version
+revertMap.text=Revert Map
revertMap.mnemonic=R
+revertMap.shortdescription=Reverts the current map from its last saved state.
revertMap.error.text=Error while reverting map
-closeMap.text=Close
-closeMap.shortdescription=Close map
-closeMap.longdescription=Closes the current map
+closeMap.text=Close Map
closeMap.mnemonic=C
+closeMap.shortdescription=Closes the current map.
+closeMap.longdescription=Closes the current map. Asks for confirmation if the map is modified.
closeMap.accel=ctrl pressed W
-recent.text=Recent
-recent.shortdescription=Load a recently opened map
+recent.text=Recent Maps
recent.mnemonic=T
-recentItem.shortdescriptionformat=Opens map {0} ({1})
+recent.shortdescription=Loads a recently opened map.
+recentItem.shortdescriptionformat=Opens map {0} ({1}).
-newMap.text=New...
-newMap.shortdescription=Create new map
-newMap.longdescription=Creates a new map
+newMap.text=New Map...
newMap.mnemonic=N
+newMap.shortdescription=Creates a new map.
newMap.accel=ctrl pressed N
-openFile.text=Open...
-openFile.shortdescription=Open a new map
-openFile.longdescription=Loads a new map from a map file
+openFile.text=Open File...
openFile.mnemonic=O
+openFile.shortdescription=Opens a file.
openFile.accel=ctrl pressed O
openFile.error.text=Error while loading
options.text=Options...
-options.shortdescription=Shows options
-options.longdescription=Shows an option dialog to change the editor settings
options.mnemonic=P
+options.shortdescription=Shows the options dialog.
+options.longdescription=Shows the options dialog for changing editor settings.
options.accel=ctrl alt pressed S
exit.text=Exit
-exit.shortdescription=Exit program
-exit.longdescription=Exits the program
exit.mnemonic=X
+exit.shortdescription=Exits the editor.
+exit.longdescription=Exits the editor. Asks for confirmation is modified maps or plugin scripts exist.
exit.accel=ctrl pressed Q
@@ -629,65 +676,92 @@
clear.text=Clear
clear.mnemonic=L
-clear.shortdescription=Clear selection
-clear.longdescription=Clears the selected squares
+clear.shortdescription=Clears the selected squares.
clear.accel=DELETE
cut.text=Cut
cut.mnemonic=T
+cut.shortdescription=Cuts the selected squares to clipboard.
cut.accel=ctrl pressed X
copy.text=Copy
copy.mnemonic=C
+copy.shortdescription=Copies the selected squares to clipboard.
copy.accel=ctrl pressed C
paste.text=Paste
paste.mnemonic=P
+paste.shortdescription=Pastes the clipboard to map cursor.
paste.accel=ctrl pressed V
shift.text=Shift
+shift.shortdescription=Shifts the selected squares.
shift.mnemonic=H
shiftNorth.text=Shift North
shiftNorth.mnemonic=N
+shiftNorth.shortdescription=Shifts the selected squares north.
shiftNorthEast.text=Shift Northeast
+shiftNorthEast.shortdescription=Shifts the selected squares north east.
shiftEast.text=Shift East
shiftEast.mnemonic=E
+shiftEast.shortdescription=Shifts the selected squares east.
shiftSouthEast.text=Shift Southeast
+shiftSouthEast.shortdescription=Shifts the selected squares south east.
shiftSouth.text=Shift South
shiftSouth.mnemonic=S
+shiftSouth.shortdescription=Shifts the selected squares south.
shiftSouthWest.text=Shift Southwest
+shiftSouthWest.shortdescription=Shifts the selected squares south west.
shiftWest.text=Shift West
shiftWest.mnemonic=W
+shiftWest.shortdescription=Shifts the selected squares west.
shiftNorthWest.text=Shift Northwest
+shiftNorthWest.shortdescription=Shifts the selected squares north west.
replace.text=Replace
replace.mnemonic=R
+replace.shortdescription=Opens the replace dialog.
replace.accel=ctrl pressed R
fillAuto.text=Fill
fillAuto.mnemonic=F
+fillAuto.shortdescription=Fills the selected squares.
+fillAuto.longdescription=Fills the selected squares. Existing floor game objects are replaced when filled with other floor game objects.
fillAuto.accel=ctrl pressed F
fillAbove.text=Fill Above
fillAbove.mnemonic=A
+fillAbove.shortdescription=Fills the selected squares above existing game objects.
+fillAbove.longdescription=Fills the selected squares above existing game objects. New game objects are added regardless of already existing game objects.
fillBelow.text=Fill Below
fillBelow.mnemonic=B
+fillBelow.shortdescription=Fills the selected squares below existing game objects.
+fillBelow.longdescription=Fills the selected squares below existing game objects. New game objects are added regardless of already existing game objects.
fillBelow.accel=ctrl shift pressed F
randFillAuto.text=Random Fill
+randFillAuto.shortdescription=Randomly fills the selected squares.
+randFillAuto.longdescription=Randomly fills the selected squares. Existing floor game objects are replaced when filled with other floor game objects.
randFillAuto.accel=ctrl pressed D
randFillAbove.text=Random Fill Above
+randFillAbove.shortdescription=Randomly fills the selected squares above existing game objects.
+randFillAbove.longdescription=Randomly fills the selected squares above existing game objects. New game objects are added regardless of already existing game objects.
randFillBelow.text=Random Fill Below
+randFillBelow.shortdescription=Randomly fills the selected squares below existing game objects.
+randFillBelow.longdescription=Randomly fills the selected squares below existing game objects. New game objects are added regardless of already existing game objects.
randFillBelow.accel=ctrl shift pressed D
floodfill.text=Flood Fill
+floodfill.shortdescription=Fills empty squares.
+floodfill.longdescription=Fills empty squares starting from the map cursor square.
selectAll.text=Select All
selectAll.mnemonic=S
+selectAll.shortdescription=Selects all map squares of the current map.
selectAll.accel=ctrl pressed A
@@ -699,9 +773,12 @@
collectArches.text=Collect Arches
collectArches.mnemonic=A
+collectArches.shortdescription=Collects archetypes into files.
+collectArches.longdescription=Collects archetypes into files. The collected files are needed by the server.
reloadFaces.text=Reload Faces
reloadFaces.mnemonic=F
+reloadFaces.shortdescription=Reloads all archetype faces.
reloadFaces.accel=ctrl pressed F5
@@ -721,23 +798,27 @@
newScript.text=New Script
newScript.mnemonic=N
+newScript.shortdescription=Creates a new event script.
editScript.text=Edit Script
editScript.mnemonic=E
+editScript.shortdescription=Opens an event script.
-validateMap.text=Check map
+validateMap.text=Check Map
validateMap.mnemonic=M
-validateMap.shortdescription=Run map checker
+validateMap.shortdescription=Runs the map validator on the current map.
zoom.text=Zoom
zoom.mnemonic=Z
+zoom.shortdescription=Opens the map previewer.
gc.text=Garbage Collection
gc.mnemonic=G
+gc.shortdescription=Immediately starts a garbage collection.
cleanCompletelyBlockedSquares.text=Clean blocked squares
cleanCompletelyBlockedSquares.mnemonic=B
-cleanCompletelyBlockedSquares.shortdescription=Cleans squares which are blocking view and passage and are only surrounded by such squares.
+cleanCompletelyBlockedSquares.shortdescription=Cleans map squares which blocks view and passage and are completely surrounded by such squares.
#######
@@ -748,13 +829,16 @@
showHelp.text=Help
showHelp.mnemonic=H
+showHelp.shortdescription=Opens the help viewer.
showHelp.accel=F1
tipOfTheDay.text=Tip Of The Day...
tipOfTheDay.mnemonic=T
+tipOfTheDay.shortdescription=Opens the tip of the day viewer.
about.text=About...
about.mnemonic=A
+abort.shortdescription=Displays information about Gridarta.
aboutTab.title=About
aboutRuntimeProperties.title=Runtime properties
@@ -830,28 +914,38 @@
lockAllPickmaps.text=Lock All Pickmaps
lockAllPickmaps.mnemonic=L
+lockAllPickmaps.shortdescription=Toggles read-only status of pickmaps.
+lockAllPickmaps.longdescription=Toggles read-only status of pickmaps. Prevents accidental changes to pickmaps when in read-only state.
-addNewPickmap.text=Add New Pickmap
+addNewPickmap.text=New Pickmap
addNewPickmap.mnemonic=N
+addNewPickmap.shortdescription=Create a new pickmap.
deletePickmap.text=Delete Active Pickmap
deletePickmap.mnemonic=D
+deletePickmap.shortdescription=Deletes the active pickmap.
openPickmapMap.text=Open Active Pickmap as Map
openPickmapMap.mnemonic=O
+openPickmapMap.shortdescription=Opens the active pickmap as a map.
savePickmap.text=Save Active Pickmap
savePickmap.mnemonic=S
+savePickmap.shortdescription=Saves the active pickmap if modified.
revertPickmap.text=Revert Active Pickmap
revertPickmap.mnemonic=R
+revertPickmap.shortdescription=Reverts the active pickmap from its last saved state.
createPickmapFolder.text=Create Pickmap Folder
+createPickmapFolder.shortdescription=Creates a new pickmap folder.
deletePickmapFolder.text=Delete Current Pickmap Folder
+deletePickmapFolder.shortdescription=Deletes the current pickmap folder.
pickmapFolders.text=Folders
pickmapFolders.mnemonic=F
+pickmapFolders.shortdescription=Pickmap folders.
######
@@ -864,10 +958,12 @@
resetView.text=Reset view
resetView.mnemonic=R
+resetView.shortdescription=Resets the view filters.
doubleFaces.text=Draw double faces
doubleFaces.mnemonic=F
-doubleFaces.shortdescription=Check this to draw double faces (e.g. stacked walls) the same way the client does
+doubleFaces.shortdescription=Toggles drawing of double faces for stacked walls.
+doubleFaces.longdescription=Toggles drawing of double faces for stacked walls the same way the client does.
doubleFaces.accel=ctrl shift pressed G
@@ -1015,50 +1111,66 @@
scriptEditNewScript.text=New Script
scriptEditNewScript.mnemonic=N
+scriptEditNewScript.shortdescription=Creates a new event script.
scriptEditNewScript.accel=ctrl pressed N
-scriptEditOpen.text=Open
+scriptEditOpen.text=Open Script
scriptEditOpen.mnemonic=O
+scriptEditOpen.shortdescription=Opens an event script.
scriptEditOpen.accel=ctrl pressed O
-scriptEditSaveAs.text=Save As
+scriptEditSaveAs.text=Save Script As
scriptEditSaveAs.mnemonic=V
+scriptEditSaveAs.shortdescription=Saves the current event script with a new name.
scriptEditSaveAs.accel=ctrl shift pressed S
-scriptEditSave.text=Save
+scriptEditSave.text=Save Script
scriptEditSave.mnemonic=S
+scriptEditSave.shortdescription=Saves the current event script if modified.
scriptEditSave.accel=ctrl pressed S
-scriptEditClose.text=Close
+scriptEditClose.text=Close Script
scriptEditClose.mnemonic=C
+scriptEditClose.shortdescription=Closes the current event script.
+scriptEditClose.longdescription=Closes the current event script. Asks for confirmation if modified.
scriptEditClose.accel=ctrl pressed W
-scriptEditCloseAll.text=Close All
+scriptEditCloseAll.text=Close All Scripts
scriptEditCloseAll.mnemonic=L
+scriptEditCloseAll.shortdescription=Closes all event scripts.
+scriptEditCloseAll.longdescription=Closes all event scripts. Asks for confirmation if any script is modified.
scriptEditCloseAll.accel=ctrl shift pressed W
scriptEditCut.text=Cut
scriptEditCut.mnemonic=T
+scriptEditCut.shortdescription=Cuts the selected text to clipboard.
scriptEditCut.accel=ctrl pressed X
scriptEditCopy.text=Copy
scriptEditCopy.mnemonic=C
+scriptEditCopy.shortdescription=Copies the selected text to clipboard.
scriptEditCopy.accel=ctrl pressed C
scriptEditPaste.text=Paste
scriptEditPaste.mnemonic=P
+scriptEditPaste.shortdescription=Pastes from clipboard.
scriptEditPaste.accel=ctrl pressed V
scriptEditFind.text=Find
scriptEditFind.mnemonic=F
+scriptEditFind.shortdescription=Opens the find text dialog.
scriptEditFind.accel=ctrl pressed F
scriptEditReplace.text=Replace
scriptEditReplace.mnemonic=R
+scriptEditReplace.shortdescription=Opens the replace text dialog.
scriptEditReplace.accel=ctrl pressed R
scriptEditFindAgain.text=Find/Replace again
scriptEditFindAgain.mnemonic=A
+scriptEditFindAgain.shortdescription=Repeats the previous find or replace action.
scriptEditFindAgain.accel=F3
scriptEditUndo.text=Undo
scriptEditUndo.name={0}
+scriptEditUndo.shortdescription=Undoes the last edit action.
scriptEditUndo.mnemonic=U
scriptEditUndo.accel=ctrl pressed Z
scriptEditRedo.text=Redo
scriptEditRedo.name={0}
scriptEditRedo.mnemonic=E
+scriptEditRedo.shortdescription=Redoes the last undo action.
scriptEditRedo.accel=ctrl pressed Y
############################
@@ -1231,10 +1343,14 @@
archetypes.mnemonic=A
displayGameObjectNames.text=Display game object names
+displayGameObjectNames.shortdescription=Displays game object names in the archetype chooser.
displayArchetypeNames.text=Display archetype names
+displayArchetypeNames.shortdescription=Displays archetype names in the archetype chooser.
displayIconsOnly.text=Display icons only
+displayIconsOnly.shortdescription=Displays icons in the archetype chooser.
findArchetypes.text=Find archetype
+findArchetypes.shortdescription=Opens the find archetypes dialog.
findArchetypes.accel=ctrl alt pressed A
@@ -1245,11 +1361,11 @@
window.mnemonic=W
nextWindow.text=Next Window
-nextWindow.shortdescription=Display next window
+nextWindow.shortdescription=Changes to next map window.
nextWindow.accel=shift pressed PAGE_UP
prevWindow.text=Previous Window
-prevWindow.shortdescription=Display previous window
+prevWindow.shortdescription=Changes to previous map window.
prevWindow.accel=shift pressed PAGE_DOWN
@@ -1274,6 +1390,7 @@
# Updater
update.text=Update...
update.mnemonic=U
+update.shortdescription=Opens the updater dialog.
update.accel=ctrl pressed U
update.title=Updating
update.message=Check for updates?
@@ -1328,17 +1445,17 @@
##################
# Selected Square
moveSquareTop.text=
-moveSquareTop.shortdescription=Move Object to top of Square
+moveSquareTop.shortdescription=Moves the selected game object to top of map square.
moveSquareUp.text=
-moveSquareUp.shortdescription=Move Object up in Square
+moveSquareUp.shortdescription=Moves the selected game object up in map square.
moveSquareDown.text=
-moveSquareDown.shortdescription=Move Object down in Square
+moveSquareDown.shortdescription=Moves the selected game object down in map square.
moveSquareBottom.text=
-moveSquareBottom.shortdescription=Move Object to bottom of Square
+moveSquareBottom.shortdescription=Moves the selected game object to bottom of map square.
moveSquareInv.text=
-moveSquareInv.shortdescription=Move Object to inventory
+moveSquareInv.shortdescription=Moves the selected game object into the inventory.
moveSquareEnv.text=
-moveSquareEnv.shortdescription=Move Object to environment
+moveSquareEnv.shortdescription=Moves the selected game object to its environment.
###############
@@ -1351,10 +1468,12 @@
controlServer.text=Control Server
controlServer.mnemonic=S
+controlServer.shortdescription=Opens the control server dialog.
controlServer.name=Server
controlServer.title=Server console
controlClient.text=Control Client
controlClient.mnemonic=C
+controlClient.shortdescription=Opens the control client dialog.
controlClient.name=Client
controlClient.title=Client console
controlError.title=Control error
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-18 20:05:51 UTC (rev 7838)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-18 22:31:33 UTC (rev 7839)
@@ -41,22 +41,31 @@
cursor.mnemonic=C
moveCursor.text=Cursor bewegen
+moveCursor.shortdescription=Bewegt den Cursor.
goNorth.text=Cursor nach Nord
+goNorth.shortdescription=Bewegt den Cursor nach Norden.
goNorthEast.text=Cursor nach Nordost
+goNorthEast.shortdescription=Bewegt den Cursor nach Nordosten.
goEast.text=Cursor nach Ost
+goEast.shortdescription=Bewegt den Cursor nach Osten.
goSouthEast.text=Cursor nach S\xFCdost
+goSouthEast.shortdescription=Bewegt den Cursor nach S\xFCdosten.
goSouth.text=Cursor nach S\xFCd
+goSouth.shortdescription=Bewegt den Cursor nach S\xFCden.
goSouthWest.text=Cursor nach S\xFCdwest
+goSouthWest.shortdescription=Bewegt den Cursor nach S\xFCdwesten.
goWest.text=Cursor nach West
+goWest.shortdescription=Bewegt den Cursor nach Westen.
goNorthWest.text=Cursor nach Nordwest
+goNorthWest.shortdescription=Bewegt den Cursor nach Nordwesten.
#######
# Map
@@ -67,61 +76,80 @@
goLocation.text=Cursor setzen
goLocation.mnemonic=S
+goLocation.shortdescription=\xD6ffnet den Dialog "Cursor setzen".
selectSquare.text=Feld ausw\xE4hlen
+selectSquare.shortdescription=Das Cursor-Feld ausw\xE4hlen.
startStopDrag.text=Auswahl starten/beenden
+startStopDrag.shortdescription=Beginnt eine neue Auswahl.
addToSelection.text=Zu Auswahl hinzuf\xFCgen
+addToSelection.shortdescription=F\xFCgt neue Auswahl zur vorhandenen Auswahl hinzu.
subFromSelection.text=Von Auswahl entfernen
+subFromSelection.shortdescription=Entfernt neue Auswahl von vorhandener Auswahl.
releaseDrag.text=Auswahl l\xF6schen
+releaseDrag.shortdescription=Beendet neue Auswahl.
insertArch.text=Objekt einf\xFCgen
+insertArch.shortdescription=F\xFCgt neues Objekt ein.
deleteArch.text=Objekt l\xF6schen
+deleteArch.shortdescription=L\xF6scht ausgew\xE4hltes Objekt.
selectArchAbove.text=Objekt oberhalb ausw\xE4hlen
+selectArchAbove.shortdescription=\xC4ndert das ausgew\xE4hlte Objekt auf das dar\xFCberliegende Objekt.
selectArchBelow.text=Objekt unterhalb ausw\xE4hlen
+selectArchBelow.shortdescription=\xC4ndert das ausgew\xE4hlte Objekt auf das darunterliegende Objekt.
archAttributes.text=Objektattribute
+archAttributes.shortdescription=\xD6ffnet den Dialog zum \xC4ndern der Objekt-Attribute.
# Map Manager
closeAllMaps.text=Alle schlie\xDFen
-closeAllMaps.shortdescription=Alle Karten schlie\xDFen
-closeAllMaps.longdescription=Schlie\xDFt alle ge\xF6ffneten Karten.
-closeAllMaps.mnemonic=A
+closeAllMaps.mnemonic=L
+closeAllMaps.shortdescription=Schlie\xDFt alle ge\xF6ffneten Karten.
+closeAllMaps.longdescription=Schlie\xDFt alle ge\xF6ffneten Karten. Ungesicherte Karten erfordern eine Best\xE4tigung.
saveAllMaps.text=Alle speichern
-saveAllMaps.shortdescription=Alle Karten speichern
-saveAllMaps.longdescription=Speichert alle ge\xF6ffneten Karten.
+saveAllMaps.shortdescription=Speichert alle ge\xF6ffneten Karten.
gridVisible.text=Gitter anzeigen
gridVisible.mnemonic=G
-gridVisible.shortdescription=Zeichne ein Gitter, das die verschiedenen Kartenfelder voneinander abgrenzt
+gridVisible.shortdescription=Zeichnet ein Gitter, das die verschiedenen Kartenfelder voneinander abgrenzt.
smoothing.text=Smoothing anzeigen
smoothing.mnemonic=S
smoothing.shortdescription=Verwischt die \xDCberg\xE4nge zwischen benachbarten Kartenfeldern.
tileShow.text=Angrenzende Karten zeigen
+tileShow.shortdescription=Zeigt angrenzende Karten.
mapCreateView.text=Neue Kartenansicht
+mapCreateView.shortdescription=\xD6ffnet eine neue Kartenansicht.
+mapCreateView.longdescription=\xD6ffnet eine neue Kartenansicht der aktiven Karte. Alle Kartenansichten zeigen dieselbe Karten; \xC4nderungen werden auf allen Ansichten angezeigt.
mapProperties.text=Karteneigenschaften
mapProperties.mnemonic=K
+mapProperties.shortdescription=\xD6ffnet den Dialog "Karteneigenschaften".
+mapProperties.longdescription=\xD6ffnet den Dialog "Karteneigenschaften" f\xFCr die aktive Karte.
shrinkMapSize.text=Kartengr\xF6\xDFe reduzieren...
-shrinkMapSize.shortdescription=Freien Bereich am rechten bzw. unteren Kartenrand entfernen
+shrinkMapSize.shortdescription=Entfernt freie Felder am rechten bzw. unteren Kartenrand.
autoJoin.text=Automatisch verbinden
autoJoin.mnemonic=V
+autoJoin.shortdescription=Aktiviert bzw. deaktiviert automatisches Verbinden von W\xE4nden.
+autoJoin.longdescription=Aktiviert bzw. deaktiviert automatisches Verbinden von eingef\xFCgten und gel\xF6schten W\xE4nden.
enterExit.text=Gehe zu Ausgang
enterExit.mnemonic=A
+enterExit.shortdescription=\xD6ffnet die Karte, auf den der Ausgang im Cursor-Feld verweist.
+enterExit.longdescription=\xD6ffnet die Karte, auf den der Ausgang im Cursor-Feld verweist. Pr\xE4fertiert das ausgew\xE4hlte Objekt, wenn dies ein Ausgang ist. Andernfalls wird das oberste Objekt im Cursor-Feld verwendet, welches ein Ausgang ist.
enterExitIOException.title=Ung\xFCltiger Pfad
enterExitIOException.message=Konnte Datei nicht laden:\n{0}
@@ -138,64 +166,90 @@
nextExit.text=N\xE4chster Ausgang
nextExit.mnemonic=N
-
+nextExit.shortdescription=W\xE4hlt den n\xE4chsten Ausgang aus.
+nextExit.longdescription=W\xE4hlt den n\xE4chsten Ausgang aus. Die Suche beginnt im Cursor-Feld oder links oben, falls kein Cursor aktiv ist.
prevExit.text=Vorheriger Ausgang
prevExit.mnemonic=O
+prevExit.shortdescription=W\xE4hlt den vorigen Ausgang aus.
+prevExit.longdescription=W\xE4hlt den vorigen Ausgang aus. Die Suche beginnt im Cursor-Feld oder rechts unten, falls kein Cursor aktiv ist.
exitConnector.text=Ausg\xE4nge verbinden
exitConnector.mnemonic=A
+exitConnector.shortdescription=Erzeugt oder aktualisiert einen Ausgang.
exitCopy.text=Ausgang kopieren
exitCopy.mnemonic=K
+exitCopy.shortdescription=Kopiert die Position des Cursor-Feldes als Ausgangs-Position.
exitPaste.text=Ausgang einf\xFCgen
exitPaste.mnemonic=E
+exitPaste.shortdescription=F\xFCgt die Ausgangs-Position in das Cursor-Feld ein.
+exitPaste.longdescription=F\xFCgt die vorher gespeicherte Ausgangs-Position in das Cursor-Feld ein. Ein bereits existierender Ausgang wird aktualisiert; andernfalls wird ein neuer Ausgang erzeugt.
exitConnect.text=Ausg\xE4nge verbinden
exitConnect.mnemonic=V
+exitConnect.shortdescription=Verbindet die Ausgangs-Position bidirektional mit dem Cursor-Feld.
+exitConnect.longdescription=Verbindet die vorher gespeicherte Ausgangs-Position bidirektional mit dem Cursor-Feld. Ein bereits existierender Ausgang wird aktualisiert; andernfalls wird ein neuer Ausgang erzeugt.
enterNorthMap.text=Gehe zu Nord-Karte
+enterNorthMap.shortdescription=\xD6ffnet die n\xF6rdlich an die aktive Karte angrenzende Karte.
enterNorthEastMap.text=Gehe zu Nordost-Karte
+enterNorthEastMap.shortdescription=\xD6ffnet die n\xF6rd\xF6stlich an die aktive Karte angrenzende Karte.
enterEastMap.text=Gehe zu Ost-Karte
+enterEastMap.shortdescription=\xD6ffnet die \xF6stlich an die aktive Karte angrenzende Karte.
enterSouthEastMap.text=Gehe zu S\xFCdost-Karte
+enterSouthEastMap.shortdescription=\xD6ffnet die s\xFCd\xF6stlich an die aktive Karte angrenzende Karte.
enterSouthMap.text=Gehe zu S\xFCd-Karte
+enterSouthMap.shortdescription=\xD6ffnet die s\xFCdlich an die aktive Karte angrenzende Karte.
enterSouthWestMap.text=Gehe zu S\xFCdwest-Karte
+enterSouthWestMap.shortdescription=\xD6ffnet die s\xFCdwestlich an die aktive Karte angrenzende Karte.
enterWestMap.text=Gehe zu West-Karte
+enterWestMap.shortdescription=\xD6ffnet die westlich an die aktive Karte angrenzende Karte.
enterNorthWestMap.text=Gehe zu Nordwest-Karte
+enterNorthWestMap.shortdescription=\xD6ffnet die nordwestlich an die aktive Karte angrenzende Karte.
deleteUnknownObjects.text=Undefinierte Objekte l\xF6schen
+deleteUnknownObjects.shortdescription=L\xF6scht alle Objekte aus der aktiven Karte, welche auf unbekannte Archetypen verweisen.
gameObjectTextEditor.text=Objekttext-Editor umschalten
+gameObjectTextEditor.shortdescription=Aktiviert bzw. deaktiviert den Objekttext-Editor.
+gameObjectTextEditor.longdescription=Aktiviert den Objekttext-Editor, wenn er nicht aktiv ist. Andernfalls reaktiviert den Reiter, vorher aktiv war.
# Plugins
plugins.text=Plugins
-plugins.shortdescription=Beanshell Plugins verwalten
plugins.mnemonic=L
+plugins.shortdescription=Verwaltet Beanshell-Plugins.
editPlugins.text=Plugins bearbeiten...
editPlugins.mnemonic=B
+editPlugins.shortdescription=\xD6ffnet den Editor zum Bearbeiten von Beanshell-Plugins.
runPlugin.text={0} starten
+runPlugin.shortdescription=Startet das Plugin.
savePlugins.text=Plugins speichern
savePlugins.mnemonic=S
+savePlugins.shortdescription=Speichert alle ungesicherten Plugins.
importPlugin.text=Plugin importieren...
importPlugin.mnemonic=I
+importPlugin.shortdescription=Importiert ein Plugin aus einer XML-Datei.
# Resources
viewTreasurelists.text=Schatzlisten anschauen
viewTreasurelists.mnemonic=S
+viewTreasurelists.shortdescription=\xD6ffnet den Dialog zur Anzeige von Schatzlisten.
collectSpells.text=Zauberspr\xFCche sammeln
collectSpells.mnemonic=Z
+collectSpells.shortdescription=Aktualisiert Zaubersr\xFCche aus einer Datei.
# Zoom
@@ -317,7 +371,7 @@
openAttrDialogNoTypes.title=Datei fehlt
openAttrDialogNoTypes.message=Die Konfigurationsdatei \"types.xml\" fehlt. Der Dialog zum \xC4ndern von Objekt-Attributen funktioniert nicht ohne diese Datei.
openAttrDialogNoDefaultArch.title=Attribute \xE4ndern
-openAttrDialogNoDefaultArch.message=Attribute von Objekten ohne Archetype k\xF6nnen nicht ge\xE4ndert werden.
+openAttrDialogNoDefaultArch.message=Attribute von Objekten ohne Archetyp k\xF6nnen nicht ge\xE4ndert werden.
encodeMapFile.title=Fehler beim Sichern
encodeMapFile.message=Beim Sichern von {0}\nist ein Fehler aufgetreten:\n{1}
@@ -505,15 +559,13 @@
# Edit
undo.text=R\xFCckg\xE4ngig
undo.name=R\xFCckg\xE4ngig {0}
-undo.shortdescription=Letze Aktion zur\xFCcknehmen
-undo.longdescription=Nimmt die letzte durchgef\xFChrte Aktion zur\xFCck.
undo.mnemonic=R
+undo.shortdescription=Nimmt die letzte durchgef\xFChrte Aktion zur\xFCck.
redo.text=Wiederholen
redo.name=Wiederholen {0}
-redo.shortdescription=Letze Aktion wiederholen
-redo.longdescription=Wiederholt die letzte durchgef\xFChrte Aktion.
redo.mnemonic=W
+redo.shortdescription=Wiederholt die letzte durchgef\xFChrte Aktion.
###########
# File Menu
@@ -521,61 +573,55 @@
file.text=Datei
file.mnemonic=D
-saveMap.text=Speichern
-saveMap.shortdescription=Karte speichern
-saveMap.longdescription=Speichert die aktuelle Karte
+saveMap.text=Karte speichern
saveMap.mnemonic=S
+saveMap.shortdescription=Speichert die aktive Karte, wenn ungesichert.
saveMap.error.text.title=Fehler beim Speichern
saveMap.error.text=Fehler beim Speichern
-saveMapAs.text=Speichern als...
-saveMapAs.shortdescription=Karte mit neuem Namen speichern
-saveMapAs.longdescription=Speichert die Karte unter einem neuen Namen
+saveMapAs.text=Karte speichern als...
saveMapAs.mnemonic=A
+saveMapAs.shortdescription=Speichert die aktive Karte unter neuem Namen.
saveMapAs.error.text=Fehler beim Speichern als
createImage.text=Bild speichern...
-createImage.shortdescription=Bild der Karte speichern
-createImage.longdescription=Erzeugt ein Foto der Karte und speichert es
createImage.mnemonic=I
+createImage.shortdescription=Speichert ein Bild der aktiven Karte.
createImage.error.text=Fehler beim Bild speichern
-revertMap.text=Zur\xFCcksetzen
-revertMap.shortdescription=Zuletzt gespeicherte Fassung
-revertMap.longdescription=Macht alle \xC4nderungen r\xFCckg\xE4ngig und stellt die zuletzt gespeicherte Fassung wieder her
+revertMap.text=Karte zur\xFCcksetzen
revertMap.mnemonic=R
+revertMap.shortdescription=Nimmt alle \xC4nderungen der aktiven Karte zur\xFCck und stellt die zuletzt gespeicherte Fassung wieder her.
revertMap.error.text=Fehler beim Zur\xFCcksetzen
-closeMap.text=Schie\xDFen
+closeMap.text=Karte schie\xDFen
+closeMap.mnemonic=C
closeMap.shortdescription=Karte schlie\xDFen
-closeMap.longdescription=Schlie\xDFt die aktuelle Karte
-closeMap.mnemonic=C
+closeMap.longdescription=Schlie\xDFt die aktive Karte.
-recent.text=Zuletzt ge\xF6ffnet
-recent.shortdescription=Lade eine k\xFCrzlich ge\xF6ffnete Karte
+recent.text=Zuletzt ge\xF6ffnete Karten
recent.mnemonic=Z
-recentItem.shortdescriptionformat=\xD6ffne Karte {0} ({1})
+recent.shortdescription=\xD6ffnet eine k\xFCrzlich ge\xF6ffnete Karte.
+recentItem.shortdescriptionformat=\xD6ffnet Karte {0} ({1}).
-newMap.text=Neu...
-newMap.shortdescription=Erzeuge neue Karte
-newMap.longdescription=Erzeugt eine neue Karte
+newMap.text=Neue Karte...
newMap.mnemonic=N
+newMap.shortdescription=Erzeugt eine neue Karte.
-openFile.text=\xD6ffnen...
-openFile.shortdescription=\xD6ffne eine Karte
-openFile.longdescription=L\xE4dt eine Karte aus einer Datei
+openFile.text=Datei \xF6ffnen...
openFile.mnemonic=F
+openFile.shortdescription=\xD6ffnet eine Datei.
openFile.error.text=Fehler beim Laden
options.text=Optionen...
-options.shortdescription=Optionen zeigen
-options.longdescription=Zeigt einen Dialog mit den Editoreinstellungen
options.mnemonic=O
+options.shortdescription=\xD6ffnet den Dialog f\xFCr Editoreinstellungen.
+options.longdescription=\xD6ffnet den Dialog f\xFCr Editoreinstellungen.
exit.text=Beenden
-exit.shortdescription=Programm beenden
-exit.longdescription=Beendet das Programm
exit.mnemonic=B
+exit.shortdescription=Verl\xE4sst den Editor.
+exit.longdescription=Verl\xE4sst den Editor. Ungesicherte Karten oder Plugins erfordern eine Best\xE4tigung.
#######
@@ -586,56 +632,83 @@
clear.text=L\xF6schen
clear.mnemonic=L
-clear.shortdescription=Auswahl l\xF6schen
-clear.longdescription=L\xF6scht den ausgew\xE4hlten Bereich.
+clear.shortdescription=L\xF6scht die Auswahl.
cut.text=Ausschneiden
cut.mnemonic=A
+cut.shortdescription=Schneidet die ausgew\xE4hlten Felder aus und kopiert sie in die Zwischenablage.
copy.text=Kopieren
copy.mnemonic=K
+copy.shortdescription=Kopiert die ausgew\xE4hlten Felder in die Zwischenablage.
paste.text=Einf\xFCgen
paste.mnemonic=E
+paste.shortdescription=Kopiert die Zwischenablage an das Cursor-Feld.
shift.text=Verschieben
shift.mnemonic=V
+shift.shortdescription=Verschiebt die ausgew\xE4hlten Felder.
-shiftNorth.text=Auswahl nach Nord verschieben
+shiftNorth.text=Nach Nord verschieben
shiftNorth.mnemonic=N
-shiftNorthEast.text=Auswahl nach Nordost verschieben
-shiftEast.text=Auswahl nach Ost verschieben
+shiftNorth.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Nord.
+shiftNorthEast.text=Nach Nordost verschieben
+shiftNorthEast.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Nordost.
+shiftEast.text=Nach Ost verschieben
shiftEast.mnemonic=O
-shiftSouthEast.text=Auswahl nach S\xFCdost verschieben
-shiftSouth.text=Auswahl nach S\xFCd verschieben
+shiftEast.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Ost.
+shiftSouthEast.text=Nach S\xFCdost verschieben
+shiftSouthEast.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach S\xFCdost.
+shiftSouth.text=Nach S\xFCd verschieben
shiftSouth.mnemonic=S
-shiftSouthWest.text=Auswahl nach S\xFCdwest verschieben
-shiftWest.text=Auswahl nach West verschieben
+shiftSouth.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach S\xFCd.
+shiftSouthWest.text=Nach S\xFCdwest verschieben
+shiftSouthWest.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach S\xFCdwest.
+shiftWest.text=Nach West verschieben
shiftWest.mnemonic=W
-shiftNorthWest.text=Auswahl nach Nordwest verschieben
+shiftWest.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach West.
+shiftNorthWest.text=Nach Nordwest verschieben
+shiftNorthWest.shortdescription=Verschiebt die ausgew\xE4hlten Felder nach Nordwest.
replace.text=Ersetzen
replace.mnemonic=Z
+replace.shortdescription=\xD6ffnet den Dialog zum Ersetzen von Objekten.
fillAuto.text=F\xFCllen
fillAuto.mnemonic=F
+fillAuto.shortdescription=F\xFCllt die ausgew\xE4hlten Felder.
+fillAuto.longdescription=F\xFCllt die ausgew\xE4hlten Felder. Bereits existierende Boden-Objekte werden ersetzt, wenn mit Boden-Objekten gef\xFCllt wird.
fillAbove.text=Oben f\xFCllen
fillAbove.mnemonic=O
+fillAbove.shortdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt.
+fillAbove.longdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte.
fillBelow.text=Unten f\xFCllen
fillBelow.mnemonic=U
+fillBelow.shortdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt.
+fillBelow.longdescription=F\xFCllt die ausgew\xE4hlten Felder. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte.
randFillAuto.text=Zuf\xE4llig f\xFCllen
+randFillAuto.shortdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig.
+randFillAuto.longdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Bereits existierende Boden-Objekte werden ersetzt, wenn mit Boden-Objekten gef\xFCllt wird.
randFillAbove.text=Zuf\xE4llig oben f\xFCllen
+randFillAbove.shortdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt.
+randFillAbove.longdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden \xFCber bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte.
randFillBelow.text=Zuf\xE4llig unten f\xFCllen
+randFillBelow.shortdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt.
+randFillBelow.longdescription=F\xFCllt die ausgew\xE4hlten Felder zuf\xE4llig. Neu eingef\xFCgte Objekte werden unter bereits existierenden Objekten eingef\xFCgt und ersetzen niemals bereits existierende Objekte.
floodfill.text=Freien Bereich f\xFCllen
+floodfill.shortdescription=F\xFCllt freie Felder.
+floodfill.longdescription=F\xFCllt freie Felder. Der F\xFCllvorgang beginnt im Cursor-Feld.
selectAll.text=Alles ausw\xE4hlen
selectAll.mnemonic=S
+selectAll.shortdescription=W\xE4hlt alle Felder der aktiven Karte aus.
############
@@ -646,9 +719,12 @@
collectArches.text=Archetypen sammeln
collectArches.mnemonic=A
+collectArches.shortdescription=Sammelt Archetypen in Dateien.
+collectArches.longdescription=Sammelt Archetypen in Dateien. Diese Dateien werden vom Server ben\xF6tigt.
reloadFaces.text=Grafiken neu laden
reloadFaces.mnemonic=F
+reloadFaces.shortdescription=L\xE4dt alle Grafiken von Archetypen neu.
#########
@@ -667,19 +743,23 @@
newScript.text=Neues Script
newScript.mnemonic=P
+newScript.shortdescription=Erzeugt ein neues Script.
editScript.text=Script \xE4ndern
editScript.mnemonic=N
+editScript.shortdescription=\xD6ffnet ein Script.
validateMap.text=Karte pr\xFCfen
validateMap.mnemonic=K
-validateMap.shortdescription=Karte auf Fehler pr\xFCfen
+validateMap.shortdescription=Pr\xFCft die aktive Karte auf Fehler.
zoom.text=Zoom
zoom.mnemonic=Z
+zoom.shortdescription=\xD6ffnet die Karten-Vorschau.
gc.text=Starte Garbage Collection
gc.mnemonic=G
+gc.shortdescription=F\xFChrt eine "Garbage Collection" aus.
cleanCompletelyBlockedSquares.text=Blockierte Felder l\xF6schen
cleanCompletelyBlockedSquares.mnemonic=B
@@ -694,12 +774,15 @@
showHelp.text=Hilfe
showHelp.mnemonic=H
+showHelp.shortdescription=\xD6ffnet die Hilfe.
tipOfTheDay.text=Tipp des Tages...
tipOfTheDay.mnemonic=T
+tipOfTheDay.shortdescription=\xD6ffnet den "Tipp des Tages".
about.text=\xDCber...
about.mnemonic=B
+abort.shortdescription=Zeigt Informationen \xFCber Gridarta an.
aboutTab.title=\xDCber
aboutRuntimeProperties.title=Laufzeitparameter
@@ -761,28 +844,38 @@
lockAllPickmaps.text=Alle Pickmaps sperren
lockAllPickmaps.mnemonic=P
+lockAllPickmaps.shortdescription=\xC4ndert den Zustand "nur lesen" der Pickmaps.
+lockAllPickmaps.longdescription=\xC4ndert den Zustand "nur lesen" der Pickmaps. Im Zustand "nur lesen" k\xF6nnen Pickmaps nicht ge\xE4ndert werden; dies verhindert unbeabsichtigte \xC4nderungen.
addNewPickmap.text=Pickmap hinzuf\xFCgen
addNewPickmap.mnemonic=H
+addNewPickmap.shortdescription=Erzeugt eine neue Pickmap.
deletePickmap.text=Aktive Pickmap l\xF6schen
deletePickmap.mnemonic=L
+deletePickmap.shortdescription=L\xF6scht die aktive Pickmap.
openPickmapMap.text=Aktive Pickmap als Karte \xF6ffnen
openPickmapMap.mnemonic=F
+openPickmapMap.shortdescription=\xDCffnet die aktive Pickmap als Karte.
savePickmap.text=Aktive Pickmap speichern
savePickmap.mnemonic=S
+savePickmap.shortdescription=Speichert die aktive Pickmap, wenn ungesichert.
revertPickmap.text=Aktive Pickmap zur\xFCcksetzen
revertPickmap.mnemonic=Z
+revertPickmap.shortdescription=Nimmt alle \xC4nderungen der aktiven Pickmap zur\xFCck und stellt die zuletzt gespeicherte Fassung wieder her.
createPickmapFolder.text=Pickmap-Gruppe hinzuf\xFCgen
+createPickmapFolder.shortdescription=Erzeugt eine neue Pickmap-Gruppe.
deletePickmapFolder.text=Aktuelle Pickmap-Gruppe l\xF6schen
+deletePickmapFolder.shortdescription=L\xF6scht die aktive Pickmap-Gruppe.
pickmapFolders.text=Pickmap-Gruppen
pickmapFolders.mnemonic=G
+pickmapFolders.shortdescription=Pickmap-Gruppen.
######
@@ -795,10 +888,12 @@
resetView.text=Ansicht zur\xFCcksetzen
resetView.mnemonic=Z
+resetView.shortdescription=Setzt die Filter zur\xFCck.
doubleFaces.text=Zeichne doppelte Grafiken
doubleFaces.mnemonic=F
-doubleFaces.shortdescription=Zeichne Grafiken, die doppelt gezeichnet werden, tats\xE4chlich doppelt (z.B. W\xE4nde)
+doubleFaces.shortdescription=Zeichnet Grafiken, die doppelt gezeichnet werden, tats\xE4chlich doppelt (z.B. W\xE4nde).
+doubleFaces.longdescription=Zeichnet Grafiken, die doppelt gezeichnet werden, tats\xE4chlich doppelt (z.B. W\xE4nde). Die Anzeige entspricht der Anzeige im Client.
#####################
@@ -829,8 +924,8 @@
optionsResArch.shortdescription=Dateiname der Archetypen-Datei
optionsResMaps=Karten
optionsResMaps.shortdescription=Verzeichnis f\xFCr Karten
-#optionsImageSet=
-#optionsImageSet.shortdescription=
+optionsImageSet=Image-Set
+optionsImageSet.shortdescription=Name des verwendeten Image-Sets
optionsRestart.title=Warnung
optionsRestart.message=Viele Optionen erfordern einen Programmneustart, um effektiv zu werden.
optionsConfigSource.text=Konfiguration laden von:
@@ -1045,11 +1140,15 @@
archetypes.text=Archetypen
archetypes.mnemonic=T
-displayGameObjectNames.text=Objektnamen anzeigen
-displayArchetypeNames.text=Archetypnamen anzeigen
+displayGameObjectNames.text=Objekt-Namen anzeigen
+displayGameObjectNames.shortdescription=Zeigt Objekt-Namen in der Archetyp-Auwahl an.
+displayArchetypeNames.text=Archetyp-Namen anzeigen
+displayArchetypeNames.shortdescription=Zeigt Archetyp-Namen in der Archetyp-Auwahl an.
displayIconsOnly.text=Bilder anzeigen
+displayIconsOnly.shortdescription=Zeigt Bilder in der Archetyp-Auwahl an.
findArchetypes.text=Archetypen finden
+findArchetypes.shortdescription=\xD6ffnet den Dialog zum Suchen von Archetypen.
#########
@@ -1059,10 +1158,10 @@
window.mnemonic=F
nextWindow.text=N\xE4chstes Fenster
-nextWindow.shortdescription=Zeige das n\xE4chste Fenster
+nextWindow.shortdescription=Zeigt das n\xE4chste Kartenfenster an.
prevWindow.text=Vorheriges Fenster
-prevWindow.shortdescription=Zeige das vorherige Fenster
+prevWindow.shortdescription=Zeigt das vorherige Kartenfenster an.
########################
@@ -1084,6 +1183,7 @@
# Updater
update.text=Update...
update.mnemonic=U
+update.shortdescription=\xD6ffnet den Dialog zum Aktualisieren des Editors.
update.title=Update
update.message=Nach Update suchen?
updateCloseMaps.title=Fehler beim Update
@@ -1138,17 +1238,17 @@
# Selected Square
moveSquareTop.text=
-moveSquareTop.shortdescription=Objekt an den Anfang verschieben
+moveSquareTop.shortdescription=Verschiebt das aktive Objekt an den Anfang.
moveSquareUp.text=
-moveSquareUp.shortdescription=Objekt nach oben verschieben
+moveSquareUp.shortdescription=Verschiebt das aktive Objekt nach oben.
moveSquareDown.text=
-moveSquareDown.shortdescription=Objekt nach unten verschieben
+moveSquareDown.shortdescription=Verschiebt das aktive Objekt nach unten.
moveSquareBottom.text=
-moveSquareBottom.shortdescription=Objekt ans Ende verschieben
+moveSquareBottom.shortdescription=Verschiebt das aktive Objekt ans Ende.
moveSquareInv.text=
-moveSquareInv.shortdescription=Objekt in Inventory verschieben
+moveSquareInv.shortdescription=Verschiebt das aktive Objekt in Inventory.
moveSquareEnv.text=
-moveSquareEnv.shortdescription=Objekt in Umgebung verschieben
+moveSquareEnv.shortdescription=Verschiebt das aktive Objekt in Umgebung.
###############
@@ -1161,10 +1261,12 @@
controlServer.text=Server steuern
controlServer.mnemonic=S
+controlServer.shortdescription=\xD6ffnet den Dialog zum Steuern des Servers.
controlServer.name=Server
controlServer.title=Server-Konsole
controlClient.text=Client steuern
controlClient.mnemonic=C
+controlClient.shortdescription=\xD6ffnet den Dialog zum Steuern des Clients.
controlClient.name=Client
controlClient.title=Client-Konsole
controlError.title=Steuerungsfehler
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-18 20:05:58
|
Revision: 7838
http://gridarta.svn.sourceforge.net/gridarta/?rev=7838&view=rev
Author: akirschbaum
Date: 2010-05-18 20:05:51 +0000 (Tue, 18 May 2010)
Log Message:
-----------
Move text resources to common code base.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -75,7 +75,6 @@
# Map Properties
mapMap=Map
-mapBackgroundMusic=Background music
mapRegion=Region
mapOutdoor=Outdoor
mapOptions=Options
@@ -91,8 +90,6 @@
mapPvP=PvP Enabled
mapPlugins=Plugins
mapText=Map Text
-mapTilesNoMapFileNoMapTilePane.title=Map tiles card unavailable
-mapTilesNoMapFileNoMapTilePane.message=The map has no file name (it wasn''t saved yet).\nA map without filename cannot be attached to other maps.\nTherefore, the Map tiles card is unavailable.
#####################
@@ -111,9 +108,6 @@
#######
# Map
-map.text=Map
-map.mnemonic=M
-
enterExit.accel=ctrl pressed NUMPAD5
enterNorthMap.accel=ctrl pressed NUMPAD9
enterNorthEastMap.accel=ctrl pressed NUMPAD6
@@ -143,48 +137,10 @@
about.title=About Gridarta for Atrinik
about=<html><h1 align="center">Gridarta for Atrinik</h1><p>Editor for Atrinik MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
-aboutTab.title=About
-license.text=License...
-license.mnemonic=L
-license.title=License
-license.missing=Cannot find License file.
-license.1.title=Gridarta
-license.1.file=COPYING
-license.2.title=JAPI
-license.2.file=japi.jar-LICENSE
-license.3.title=SUN Icons
-license.3.file=jlfgr-1_0.jar-LICENSE
-license.4.title=BeanShell
-license.4.file=bsh-LICENSE
-license.5.title=Log4J
-license.5.file=log4j-1.2.13.jar-LICENSE
-license.6.title=GNU getopt
-license.6.file=java-getopt-1.0.13.jar-LICENSE
-
-aboutRuntimeProperties.title=Runtime properties
aboutBuildProperties.title=Build properties
-############
-# Map window
-
-mapwindowFile.text=File
-mapwindowFile.mnemonic=F
-
-mapwindowEdit.text=Edit
-mapwindowEdit.mnemonic=E
-
-mapwindowMap.text=Map
-mapwindowMap.mnemonic=M
-
-mapwindowCursor.text=Cursor
-mapwindowCursor.mnemonic=C
-
-
#######################
# Various Log Messages
-logDuplicateAnimation=Duplicate Animation: {0}
-logInventoryInDefArch=Found inventory Object in def arch: {0}
-logFoundCoordInDefArchSingleSquareOrHead=Found {0} cmd in single square or head (add it to arch text): {1}
logDefArchWithInvalidMpartNr=Arch part {0} has mpart_nr {2}, but head part {1} has mpart_nr {3}
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -33,7 +33,6 @@
# Map Properties
mapMap=Karte
-mapBackgroundMusic=Hintergrundmusik
mapRegion=Region
mapOutdoor=Im Freien
mapOptions=Optionen
@@ -49,8 +48,6 @@
mapPvP=Spieler gegen Spieler aktiv
mapPlugins=Plugins
mapText=Kartentext
-mapTilesNoMapFileNoMapTilePane.title=Verbindungspfade nicht verf\xFCgbar
-mapTilesNoMapFileNoMapTilePane.message=Die Karte wurde noch nicht gespeichert. Daher hat sie noch keinen Dateinamen.\nEine Karte ohne Dateiname kann nicht mit anderen Karten verbunden werden.\nDaher ist der Reiter "Verbindungspfade" zur Zeit nicht verf\xFCgbar.
#####################
@@ -67,39 +64,9 @@
#######
-# Map
-
-map.text=Karte
-map.mnemonic=K
-
-
-#######
# Help
about.title=\xDCber Gridarta f\xFCr Atrinik
about=<html><h1 align="center">Gridarta f\xFCr Atrinik</h1><p>Editor f\xFCr Atrinik MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">Entwickler:</td><td>{2}</td></tr><tr><td align="right">Erstellung:</td><td>{3}</td></tr></table></html>
-aboutTab.title=\xDCber
-license.text=Lizenz...
-license.mnemonic=L
-license.title=Lizenz
-license.missing=Kann Lizenzdatei nicht finden.
-
-aboutRuntimeProperties.title=Laufzeitparameter
#aboutBuildProperties.title=
-
-
-############
-# Map window
-
-mapwindowFile.text=Datei
-mapwindowFile.mnemonic=D
-
-mapwindowEdit.text=Bearbeiten
-mapwindowEdit.mnemonic=B
-
-mapwindowMap.text=Karte
-mapwindowMap.mnemonic=K
-
-mapwindowCursor.text=Cursor
-mapwindowCursor.mnemonic=C
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -34,7 +34,6 @@
# Map Properties
#mapMap=
-#mapBackgroundMusic=
#mapRegion=
#mapOutdoor=
#mapOptions=
@@ -50,8 +49,6 @@
#mapPvP=
#mapPlugins=
#mapText=
-#mapTilesNoMapFileNoMapTilePane.title=
-#mapTilesNoMapFileNoMapTilePane.message=
#####################
@@ -69,39 +66,9 @@
#######
-# Map
-
-map.text=Carte
-map.mnemonic=C
-
-
-#######
# Help
#about.title=
#about=
-#aboutTab.title=
-#license.text=
-#license.mnemonic=
-#license.title=
-#license.missing=
-
-#aboutRuntimeProperties.title=
#aboutBuildProperties.title=
-
-
-############
-# Map window
-
-mapwindowFile.text=Fichier
-mapwindowFile.mnemonic=F
-
-mapwindowEdit.text=Edition
-mapwindowEdit.mnemonic=E
-
-mapwindowMap.text=Carte
-mapwindowMap.mnemonic=C
-
-#mapwindowCursor.text=
-mapwindowCursor.mnemonic=U
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -33,7 +33,6 @@
# Map Properties
mapMap=Karta
-mapBackgroundMusic=Bakgrundsljud
#mapRegion=
mapOutdoor=Utomhus
mapOptions=Inst\xE4llningar
@@ -49,8 +48,6 @@
mapPvP=Spelare mot Spelare
#mapPlugins=
mapText=Karttext
-mapTilesNoMapFileNoMapTilePane.title=N\xE4rliggande kartor ej tillg\xE4ngligt
-mapTilesNoMapFileNoMapTilePane.message=Kartan har inget filnamn (den \xE4r inte sparad \xE4nnu).\nEn karta utan filnamn kan inte anslutas till andra kartor.\nD\xE4rf\xF6r kan du inte v\xE4lja n\xE4rliggande kartor utan att f\xF6rst spara kartan.
#####################
@@ -67,39 +64,9 @@
#######
-# Map
-
-map.text=Karta
-map.mnemonic=K
-
-
-#######
# Help
about.title=Om Gridarta for Atrinik
about=<html><h1 align="center">Gridarta for Daimoin</h1><p>Editor for Atrinik MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">av:</td><td>{2}</td></tr><tr><td align="right">datum:</td><td>{3}</td></tr></table></html>
-aboutTab.title=Om
-license.text=Licens...
-license.mnemonic=L
-license.title=Licens
-license.missing=Kan inte hitta licensfilen.
-
-aboutRuntimeProperties.title=Runtime properties
aboutBuildProperties.title=Build properties
-
-
-############
-# Map window
-
-mapwindowFile.text=Arkiv
-mapwindowFile.mnemonic=A
-
-mapwindowEdit.text=Redigera
-mapwindowEdit.mnemonic=R
-
-mapwindowMap.text=Karta
-mapwindowMap.mnemonic=K
-
-mapwindowCursor.text=Mark\xF6r
-mapwindowCursor.mnemonic=M
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -85,7 +85,6 @@
mapUnique=Unique map
mapOutdoor=Outdoor map
mapNosmooth=Nosmooth map
-mapBackgroundMusic=Background music
mapShopType=Shop type
mapShopGreed=Greed
mapUpperPriceLimit=Upper price limit
@@ -97,16 +96,11 @@
mapWindSpeed=Wind speed
mapWindDirection=Wind direction
mapSkySetting=Sky setting
-mapTilesNoMapFileNoMapTilePane.title=Map tiles card unavailable
-mapTilesNoMapFileNoMapTilePane.message=The map has no file name (it wasn''t saved yet).\nA map without filename cannot be attached to other maps.\nTherefore, the Map tiles card is unavailable.
#######
# Map
-map.text=Map
-map.mnemonic=M
-
enterExit.accel=ctrl pressed E
enterNorthMap.accel=ctrl pressed UP
enterEastMap.accel=ctrl pressed RIGHT
@@ -129,48 +123,3 @@
about.title=About Gridarta for Crossfire
about=<html><h1 align="center">Gridarta for Crossfire</h1><p>Editor for Crossfire MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
-aboutTab.title=About
-
-license.text=License...
-license.mnemonic=L
-license.title=License
-license.missing=Cannot find License file.
-license.1.title=Gridarta
-license.1.file=COPYING
-license.2.title=JAPI
-license.2.file=japi.jar-LICENSE
-license.3.title=SUN Icons
-license.3.file=jlfgr-1_0.jar-LICENSE
-license.4.title=BeanShell
-license.4.file=bsh-LICENSE
-license.5.title=Log4J
-license.5.file=log4j-1.2.13.jar-LICENSE
-license.6.title=JDOM
-license.6.file=jdom.jar-LICENSE
-license.7.title=GNU getopt
-license.7.file=java-getopt-1.0.13.jar-LICENSE
-
-aboutRuntimeProperties.title=Runtime properties
-
-
-############
-# Map window
-
-mapwindowFile.text=File
-mapwindowFile.mnemonic=F
-
-mapwindowEdit.text=Edit
-mapwindowEdit.mnemonic=E
-
-mapwindowMap.text=Map
-mapwindowMap.mnemonic=M
-
-mapwindowCursor.text=Cursor
-mapwindowCursor.mnemonic=C
-
-
-#######################
-# Various Log Messages
-logDuplicateAnimation=Duplicate Animation: {0}
-logInventoryInDefArch=Found inventory Object in def arch: {0}
-logFoundCoordInDefArchSingleSquareOrHead=Found {0} cmd in single square or head (add it to arch text): {1}
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -40,7 +40,6 @@
mapUnique=Permanente Karte
mapOutdoor=Im Freien
mapNosmooth=Ohne Bild\xFCberg\xE4ng
-mapBackgroundMusic=Hintergrundmusik
mapShopType=Typ
mapShopGreed=Geldgier
mapLowerPriceLimit=Mindestpreis
@@ -52,43 +51,10 @@
mapWindSpeed=Windgeschwindigkeit
mapWindDirection=Windrichtung
mapSkySetting=Wetterbedingung
-mapTilesNoMapFileNoMapTilePane.title=Verbindungspfade nicht verf\xFCgbar
-mapTilesNoMapFileNoMapTilePane.message=Die Karte wurde noch nicht gespeichert. Daher hat sie noch keinen Dateinamen.\nEine Karte ohne Dateiname kann nicht mit anderen Karten verbunden werden.\nDaher ist der Reiter "Verbindungspfade" zur Zeit nicht verf\xFCgbar.
#######
-# Map
-
-map.text=Karte
-map.mnemonic=K
-
-
-#######
# Help
about.title=\xDCber Gridarta f\xFCr Crossfire
about=<html><h1 align="center">Gridarta f\xFCr Crossfire</h1><p>Editor f\xFCr Crossfire MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">Entwickler:</td><td>{2}</td></tr><tr><td align="right">Erstellung:</td><td>{3}</td></tr></table></html>
-aboutTab.title=\xDCber
-
-license.text=Lizenz...
-license.mnemonic=L
-license.title=Lizenz
-license.missing=Kann Lizenzdatei nicht finden.
-
-aboutRuntimeProperties.title=Laufzeitparameter
-
-
-############
-# Map window
-
-mapwindowFile.text=Datei
-mapwindowFile.mnemonic=D
-
-mapwindowEdit.text=Bearbeiten
-mapwindowEdit.mnemonic=B
-
-mapwindowMap.text=Karte
-mapwindowMap.mnemonic=K
-
-mapwindowCursor.text=Cursor
-mapwindowCursor.mnemonic=C
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -41,7 +41,6 @@
#mapUnique=
#mapOutdoor=
#mapNosmooth=
-#mapBackgroundMusic=
#mapShopType=
#mapShopGreed=
#mapUpperPriceLimit=
@@ -53,43 +52,10 @@
#mapWindSpeed=
#mapWindDirection=
#mapSkySetting=
-#mapTilesNoMapFileNoMapTilePane.title=
-#mapTilesNoMapFileNoMapTilePane.message=
#######
-# Map
-
-map.text=Carte
-map.mnemonic=C
-
-
-#######
# Help
#about.title=
#about=
-#aboutTab.title=
-
-#license.text=
-#license.mnemonic=
-#license.title=
-#license.missing=
-
-#aboutRuntimeProperties.title=
-
-
-############
-# Map window
-
-mapwindowFile.text=Fichier
-mapwindowFile.mnemonic=F
-
-mapwindowEdit.text=Edition
-mapwindowEdit.mnemonic=E
-
-mapwindowMap.text=Carte
-mapwindowMap.mnemonic=C
-
-#mapwindowCursor.text=
-mapwindowCursor.mnemonic=U
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -40,7 +40,6 @@
#mapUnique=
mapOutdoor=Utomhus
#mapNosmooth=
-#mapBackgroundMusic=
#mapShopType=
#mapShopGreed=
#mapUpperPriceLimit=
@@ -52,43 +51,10 @@
#mapWindSpeed=
#mapWindDirection=
#mapSkySetting=
-mapTilesNoMapFileNoMapTilePane.title=N\xE4rliggande kartor ej tillg\xE4ngligt
-mapTilesNoMapFileNoMapTilePane.message=Kartan har inget filnamn (den \xE4r inte sparad \xE4nnu).\nEn karta utan filnamn kan inte anslutas till andra kartor.\nD\xE4rf\xF6r kan du inte v\xE4lja n\xE4rliggande kartor utan att f\xF6rst spara kartan.
#######
-# Map
-
-map.text=Karta
-map.mnemonic=K
-
-
-#######
# Help
about.title=Om Gridarta for Crossfire
about=<html><h1 align="center">Gridarta for Crossfire</h1><p>Editor for Crossfire MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">av:</td><td>{2}</td></tr><tr><td align="right">datum:</td><td>{3}</td></tr></table></html>
-aboutTab.title=Om
-
-license.text=Licens...
-license.mnemonic=L
-license.title=Licens
-license.missing=Kan inte hitta licensfilen.
-
-aboutRuntimeProperties.title=Runtime properties
-
-
-############
-# Map window
-
-mapwindowFile.text=Arkiv
-mapwindowFile.mnemonic=A
-
-mapwindowEdit.text=Redigera
-mapwindowEdit.mnemonic=R
-
-mapwindowMap.text=Karta
-mapwindowMap.mnemonic=K
-
-mapwindowCursor.text=Mark\xF6r
-mapwindowCursor.mnemonic=M
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -75,7 +75,6 @@
# Map Properties
mapMap=Map
-mapBackgroundMusic=Background music
mapOutdoor=Outdoor
mapOptions=Options
mapNoSave=No Save
@@ -89,8 +88,6 @@
mapInstantDeath=Instant Death
mapPvP=PvP Enabled
mapText=Map Text
-mapTilesNoMapFileNoMapTilePane.title=Map tiles card unavailable
-mapTilesNoMapFileNoMapTilePane.message=The map has no file name (it wasn''t saved yet).\nA map without filename cannot be attached to other maps.\nTherefore, the Map tiles card is unavailable.
#####################
@@ -109,9 +106,6 @@
#######
# Map
-map.text=Map
-map.mnemonic=M
-
enterExit.accel=ctrl pressed NUMPAD5
enterNorthMap.accel=ctrl pressed NUMPAD9
enterNorthEastMap.accel=ctrl pressed NUMPAD6
@@ -141,48 +135,10 @@
about.title=About Gridarta for Daimonin
about=<html><h1 align="center">Gridarta for Daimonin</h1><p>Editor for Daimonin MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
-aboutTab.title=About
-license.text=License...
-license.mnemonic=L
-license.title=License
-license.missing=Cannot find License file.
-license.1.title=Gridarta
-license.1.file=COPYING
-license.2.title=JAPI
-license.2.file=japi.jar-LICENSE
-license.3.title=SUN Icons
-license.3.file=jlfgr-1_0.jar-LICENSE
-license.4.title=BeanShell
-license.4.file=bsh-LICENSE
-license.5.title=Log4J
-license.5.file=log4j-1.2.13.jar-LICENSE
-license.6.title=GNU getopt
-license.6.file=java-getopt-1.0.13.jar-LICENSE
-
-aboutRuntimeProperties.title=Runtime properties
aboutBuildProperties.title=Build properties
-############
-# Map window
-
-mapwindowFile.text=File
-mapwindowFile.mnemonic=F
-
-mapwindowEdit.text=Edit
-mapwindowEdit.mnemonic=E
-
-mapwindowMap.text=Map
-mapwindowMap.mnemonic=M
-
-mapwindowCursor.text=Cursor
-mapwindowCursor.mnemonic=C
-
-
#######################
# Various Log Messages
-logDuplicateAnimation=Duplicate Animation: {0}
-logInventoryInDefArch=Found inventory Object in def arch: {0}
-logFoundCoordInDefArchSingleSquareOrHead=Found {0} cmd in single square or head (add it to arch text): {1}
logDefArchWithInvalidMpartNr=Arch part {0} has mpart_nr {2}, but head part {1} has mpart_nr {3}
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -33,7 +33,6 @@
# Map Properties
mapMap=Karte
-mapBackgroundMusic=Hintergrundmusik
mapOutdoor=Im Freien
mapOptions=Optionen
mapNoSave=Nicht speichern
@@ -47,8 +46,6 @@
mapInstantDeath=Sofort-Tod
mapPvP=Spieler gegen Spieler aktiv
mapText=Kartentext
-mapTilesNoMapFileNoMapTilePane.title=Verbindungspfade nicht verf\xFCgbar
-mapTilesNoMapFileNoMapTilePane.message=Die Karte wurde noch nicht gespeichert. Daher hat sie noch keinen Dateinamen.\nEine Karte ohne Dateiname kann nicht mit anderen Karten verbunden werden.\nDaher ist der Reiter "Verbindungspfade" zur Zeit nicht verf\xFCgbar.
#####################
@@ -65,39 +62,9 @@
#######
-# Map
-
-map.text=Karte
-map.mnemonic=K
-
-
-#######
# Help
about.title=\xDCber Gridarta f\xFCr Daimonin
about=<html><h1 align="center">Gridarta f\xFCr Daimonin</h1><p>Editor f\xFCr Daimonin MMORPG Karten und Objekte</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">Entwickler:</td><td>{2}</td></tr><tr><td align="right">Erstellung:</td><td>{3}</td></tr></table></html>
-aboutTab.title=\xDCber
-license.text=Lizenz...
-license.mnemonic=L
-license.title=Lizenz
-license.missing=Kann Lizenzdatei nicht finden.
-
-aboutRuntimeProperties.title=Laufzeitparameter
#aboutBuildProperties.title=
-
-
-############
-# Map window
-
-mapwindowFile.text=Datei
-mapwindowFile.mnemonic=D
-
-mapwindowEdit.text=Bearbeiten
-mapwindowEdit.mnemonic=B
-
-mapwindowMap.text=Karte
-mapwindowMap.mnemonic=K
-
-mapwindowCursor.text=Cursor
-mapwindowCursor.mnemonic=C
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -34,7 +34,6 @@
# Map Properties
#mapMap=
-#mapBackgroundMusic=
#mapOutdoor=
#mapOptions=
#mapNoSave=
@@ -48,8 +47,6 @@
#mapInstantDeath=
#mapPvP=
#mapText=
-#mapTilesNoMapFileNoMapTilePane.title=
-#mapTilesNoMapFileNoMapTilePane.message=
#####################
@@ -67,39 +64,9 @@
#######
-# Map
-
-map.text=Carte
-map.mnemonic=C
-
-
-#######
# Help
#about.title=
#about=
-#aboutTab.title=
-#license.text=
-#license.mnemonic=
-#license.title=
-#license.missing=
-
-#aboutRuntimeProperties.title=
#aboutBuildProperties.title=
-
-
-############
-# Map window
-
-mapwindowFile.text=Fichier
-mapwindowFile.mnemonic=F
-
-mapwindowEdit.text=Edition
-mapwindowEdit.mnemonic=E
-
-mapwindowMap.text=Carte
-mapwindowMap.mnemonic=C
-
-#mapwindowCursor.text=
-mapwindowCursor.mnemonic=U
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -33,7 +33,6 @@
# Map Properties
mapMap=Karta
-mapBackgroundMusic=Bakgrundsljud
mapOutdoor=Utomhus
mapOptions=Inst\xE4llningar
mapNoSave=Ingen spara
@@ -47,8 +46,6 @@
mapInstantDeath=Omedelbar d\xF6d
mapPvP=Spelare mot Spelare
mapText=Karttext
-mapTilesNoMapFileNoMapTilePane.title=N\xE4rliggande kartor ej tillg\xE4ngligt
-mapTilesNoMapFileNoMapTilePane.message=Kartan har inget filnamn (den \xE4r inte sparad \xE4nnu).\nEn karta utan filnamn kan inte anslutas till andra kartor.\nD\xE4rf\xF6r kan du inte v\xE4lja n\xE4rliggande kartor utan att f\xF6rst spara kartan.
#####################
@@ -65,39 +62,9 @@
#######
-# Map
-
-map.text=Karta
-map.mnemonic=K
-
-
-#######
# Help
about.title=Om Gridarta for Daimonin
about=<html><h1 align="center">Gridarta for Daimoin</h1><p>Editor for Daimonin MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Build number:</td><td>{1}</td></tr><tr><td align="right">av:</td><td>{2}</td></tr><tr><td align="right">datum:</td><td>{3}</td></tr></table></html>
-aboutTab.title=Om
-license.text=Licens...
-license.mnemonic=L
-license.title=Licens
-license.missing=Kan inte hitta licensfilen.
-
-aboutRuntimeProperties.title=Runtime properties
aboutBuildProperties.title=Build properties
-
-
-############
-# Map window
-
-mapwindowFile.text=Arkiv
-mapwindowFile.mnemonic=A
-
-mapwindowEdit.text=Redigera
-mapwindowEdit.mnemonic=R
-
-mapwindowMap.text=Karta
-mapwindowMap.mnemonic=K
-
-mapwindowCursor.text=Mark\xF6r
-mapwindowCursor.mnemonic=M
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -58,6 +58,12 @@
goNorthWest.text=Move Cursor Northwest
+#######
+# Map
+
+map.text=Map
+map.mnemonic=M
+
goLocation.text=Goto Location
goLocation.mnemonic=L
goLocation.accel=ctrl pressed L
@@ -405,6 +411,7 @@
mapErrorIllegalSize.message=Map dimensions must be greater than zero.
# attribute fields:
mapName=Name
+mapBackgroundMusic=Background music
mapSwapTime=Swap Time
mapFixedReset=Fixed Reset
mapEnterX=Enter X
@@ -426,6 +433,8 @@
mapTilesAttach.shortdescription=Automatically attach the map in all possible directions
mapTilesClear.text=Clear Paths
mapTilesClear.shortdescription=Clear all path names
+mapTilesNoMapFileNoMapTilePane.title=Map tiles card unavailable
+mapTilesNoMapFileNoMapTilePane.message=The map has no file name (it wasn''t saved yet).\nA map without filename cannot be attached to other maps.\nTherefore, the Map tiles card is unavailable.
mapQueryLoaded.title=Map is loaded
mapQueryLoaded.message=The map {0} is opened in the editor.\nShould I autosave & update the map?
mapErrorPath2.title=Can''t find map
@@ -519,9 +528,12 @@
logImageCreated=Created image "{0}" of map "{1}".
logUnexpectedException=Unexpected exception: {0}
logCanonIOE=IOException while canonizing path: {0}
+logDuplicateAnimation=Duplicate Animation: {0}
logExitWithExit=Exiting with System.exit().
logExitWithoutExit=Trying to exit without System.exit().
logFaceObjectWithoutOriginalName=No originalName for {0}!
+logFoundCoordInDefArchSingleSquareOrHead=Found {0} cmd in single square or head (add it to arch text): {1}
+logInventoryInDefArch=Found inventory Object in def arch: {0}
# Edit
undo.text=Undo
@@ -744,7 +756,29 @@
about.text=About...
about.mnemonic=A
+aboutTab.title=About
+aboutRuntimeProperties.title=Runtime properties
+license.text=License...
+license.mnemonic=L
+license.title=License
+license.missing=Cannot find License file.
+license.1.title=Gridarta
+license.1.file=COPYING
+license.2.title=JAPI
+license.2.file=japi.jar-LICENSE
+license.3.title=SUN Icons
+license.3.file=jlfgr-1_0.jar-LICENSE
+license.4.title=BeanShell
+license.4.file=bsh-LICENSE
+license.5.title=Log4J
+license.5.file=log4j-1.2.13.jar-LICENSE
+license.6.title=JDOM
+license.6.file=jdom.jar-LICENSE
+license.7.title=GNU getopt
+license.7.file=java-getopt-1.0.13.jar-LICENSE
+
+
#################
# Map Arch Panel
@@ -1379,3 +1413,19 @@
tabButtonMoveToBottom.text=Bottom
tabButtonMoveToLeft.text=Left
tabButtonMoveToRight.text=Right
+
+
+############
+# Map window
+
+mapwindowFile.text=File
+mapwindowFile.mnemonic=F
+
+mapwindowEdit.text=Edit
+mapwindowEdit.mnemonic=E
+
+mapwindowMap.text=Map
+mapwindowMap.mnemonic=M
+
+mapwindowCursor.text=Cursor
+mapwindowCursor.mnemonic=C
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -58,6 +58,13 @@
goNorthWest.text=Cursor nach Nordwest
+#######
+# Map
+
+map.text=Karte
+map.mnemonic=K
+
+
goLocation.text=Cursor setzen
goLocation.mnemonic=S
@@ -383,6 +390,7 @@
mapErrorIllegalSize.message=Die Kartengr\xF6\xDFe muss positiv sein.
# attribute fields:
mapName=Name
+mapBackgroundMusic=Hintergrundmusik
mapSwapTime=Swap-Zeit
mapFixedReset=Fixer Reset
mapEnterX=Startpunkt X
@@ -404,6 +412,8 @@
mapTilesAttach.shortdescription=Verbindet die Karte automatisch in allen Richtungen mit ihren benachbarten Karten.
mapTilesClear.text=Pfade l\xF6schen
mapTilesClear.shortdescription=L\xF6scht die Verbindungspfade zu den benachbarten Karten.
+mapTilesNoMapFileNoMapTilePane.title=Verbindungspfade nicht verf\xFCgbar
+mapTilesNoMapFileNoMapTilePane.message=Die Karte wurde noch nicht gespeichert. Daher hat sie noch keinen Dateinamen.\nEine Karte ohne Dateiname kann nicht mit anderen Karten verbunden werden.\nDaher ist der Reiter "Verbindungspfade" zur Zeit nicht verf\xFCgbar.
mapQueryLoaded.title=Karte ist ge\xF6ffnet
mapQueryLoaded.message=Die Karte {0} ist im Editor ge\xF6ffnet.\nSoll ich sie automatisch speichern und aktualisieren?
mapErrorPath2.title=Karte nicht gefunden
@@ -691,7 +701,15 @@
about.text=\xDCber...
about.mnemonic=B
+aboutTab.title=\xDCber
+aboutRuntimeProperties.title=Laufzeitparameter
+license.text=Lizenz...
+license.mnemonic=L
+license.title=Lizenz
+license.missing=Kann Lizenzdatei nicht finden.
+
+
#################
# Map Arch Panel
@@ -1204,3 +1222,19 @@
tabButtonMoveToBottom.text=Unten
tabButtonMoveToLeft.text=Links
tabButtonMoveToRight.text=Rechts
+
+
+############
+# Map window
+
+mapwindowFile.text=Datei
+mapwindowFile.mnemonic=D
+
+mapwindowEdit.text=Bearbeiten
+mapwindowEdit.mnemonic=B
+
+mapwindowMap.text=Karte
+mapwindowMap.mnemonic=K
+
+mapwindowCursor.text=Cursor
+mapwindowCursor.mnemonic=C
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -58,6 +58,12 @@
#goNorthWest.text=
+#######
+# Map
+
+map.text=Carte
+map.mnemonic=C
+
#goLocation.text=
#selectSquare.text=
@@ -378,6 +384,7 @@
#mapErrorIllegalSize.message=
# attribute fields:
#mapName=
+#mapBackgroundMusic=
#mapSwapTime=
#mapFixedReset=
#mapEnterX=
@@ -399,6 +406,8 @@
#mapTilesAttach.shortdescription=
#mapTilesClear.text=
#mapTilesClear.shortdescription=
+#mapTilesNoMapFileNoMapTilePane.title=
+#mapTilesNoMapFileNoMapTilePane.message=
#mapQueryLoaded.title=
#mapQueryLoaded.message=
#mapErrorPath2.title=
@@ -686,7 +695,15 @@
about.text=\xC0 propos...
about.mnemonic=P
+#aboutTab.title=
+#aboutRuntimeProperties.title=
+#license.text=
+#license.mnemonic=
+#license.title=
+#license.missing=
+
+
#################
# Map Arch Panel
@@ -1194,3 +1211,19 @@
#tabButtonMoveToBottom.text=
#tabButtonMoveToLeft.text=
#tabButtonMoveToRight.text=
+
+
+############
+# Map window
+
+mapwindowFile.text=Fichier
+mapwindowFile.mnemonic=F
+
+mapwindowEdit.text=Edition
+mapwindowEdit.mnemonic=E
+
+mapwindowMap.text=Carte
+mapwindowMap.mnemonic=C
+
+#mapwindowCursor.text=
+mapwindowCursor.mnemonic=U
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-18 20:05:51 UTC (rev 7838)
@@ -58,6 +58,12 @@
goNorthWest.text=Flytta mark\xF6r nordv\xE4st
+#######
+# Map
+
+map.text=Karta
+map.mnemonic=K
+
#goLocation.text=
selectSquare.text=Markera ruta
@@ -381,6 +387,7 @@
mapErrorIllegalSize.message=Kartdimensioner m\xE5ste vara st\xF6rre \xE4n 0.
# attribute fields:
mapName=Namn
+mapBackgroundMusic=Bakgrundsljud
mapSwapTime=Tid innan v\xE4xling
mapFixedReset=Fixerad \xE5terst\xE4llning
mapEnterX=Ing\xE5ng X
@@ -402,6 +409,8 @@
mapTilesAttach.shortdescription=Automatiskt anslut kartan till alla n\xE4rliggande kartor i alla riktningar.
mapTilesClear.text=Rensa s\xF6kv\xE4gar
mapTilesClear.shortdescription=T\xF6m alla s\xF6kv\xE4gar
+mapTilesNoMapFileNoMapTilePane.title=N\xE4rliggande kartor ej tillg\xE4ngligt
+mapTilesNoMapFileNoMapTilePane.message=Kartan har inget filnamn (den \xE4r inte sparad \xE4nnu).\nEn karta utan filnamn kan inte anslutas till andra kartor.\nD\xE4rf\xF6r kan du inte v\xE4lja n\xE4rliggande kartor utan att f\xF6rst spara kartan.
mapQueryLoaded.title=Kartan \xE4r inladdad
mapQueryLoaded.message=Kartan {0} \xE4r \xF6ppen i editorn.\nSka jag autospara och uppdatera den?
mapErrorPath2.title=Kan inte hitta karta
@@ -690,7 +699,15 @@
about.text=Om...
about.mnemonic=O
+aboutTab.title=Om
+aboutRuntimeProperties.title=Runtime properties
+license.text=Licens...
+license.mnemonic=L
+license.title=Licens
+license.missing=Kan inte hitta licensfilen.
+
+
#################
# Map Arch Panel
@@ -1200,3 +1217,19 @@
#tabButtonMoveToBottom.text=
#tabButtonMoveToLeft.text=
#tabButtonMoveToRight.text=
+
+
+############
+# Map window
+
+mapwindowFile.text=Arkiv
+mapwindowFile.mnemonic=A
+
+mapwindowEdit.text=Redigera
+mapwindowEdit.mnemonic=R
+
+mapwindowMap.text=Karta
+mapwindowMap.mnemonic=K
+
+mapwindowCursor.text=Mark\xF6r
+mapwindowCursor.mnemonic=M
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-18 07:30:43
|
Revision: 7837
http://gridarta.svn.sourceforge.net/gridarta/?rev=7837&view=rev
Author: akirschbaum
Date: 2010-05-18 07:30:36 +0000 (Tue, 18 May 2010)
Log Message:
-----------
Move text resources to common code base.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -128,11 +128,6 @@
#######
# Cursor
-cursor.text=Cursor
-cursor.mnemonic=C
-
-moveCursor.text=Move Cursor
-
goNorth.accel=NUMPAD9
goNorthEast.accel=NUMPAD6
goEast.accel=NUMPAD3
@@ -143,28 +138,6 @@
goNorthWest.accel=NUMPAD8
-############
-# Archetypes
-
-archetypes.text=Archetypes
-archetypes.mnemonic=A
-
-
-#########
-# Window
-
-window.text=Window
-window.mnemonic=W
-
-nextWindow.text=Next Window
-nextWindow.shortdescription=Display next window
-nextWindow.accel=shift pressed PAGE_UP
-
-prevWindow.text=Previous Window
-prevWindow.shortdescription=Display previous window
-prevWindow.accel=shift pressed PAGE_DOWN
-
-
#######
# Help
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -74,35 +74,6 @@
#######
-# Cursor
-
-cursor.text=Cursor
-cursor.mnemonic=C
-
-moveCursor.text=Cursor bewegen
-
-
-############
-# Archetypes
-
-archetypes.text=Archetypen
-archetypes.mnemonic=T
-
-
-#########
-# Window
-
-window.text=Fenster
-window.mnemonic=F
-
-nextWindow.text=N\xE4chstes Fenster
-nextWindow.shortdescription=Zeige das n\xE4chste Fenster
-
-prevWindow.text=Vorheriges Fenster
-prevWindow.shortdescription=Zeige das vorherige Fenster
-
-
-#######
# Help
about.title=\xDCber Gridarta f\xFCr Atrinik
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -76,35 +76,6 @@
#######
-# Cursor
-
-#cursor.text=
-#cursor.mnemonic=
-
-#moveCursor.text=
-
-
-############
-# Archetypes
-
-archetypes.text=Arches
-archetypes.mnemonic=A
-
-
-#########
-# Window
-
-window.text=Fen\xEAtres
-window.mnemonic=N
-
-nextWindow.text=Fen\xEAtre suivante
-nextWindow.shortdescription=Affiche la fen\xEAtre suivante
-
-prevWindow.text=Fen\xEAtre pr\xE9c\xE9dente
-prevWindow.shortdescription=Affiche la fen\xEAtre pr\xE9c\xE9dente
-
-
-#######
# Help
#about.title=
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -74,35 +74,6 @@
#######
-# Cursor
-
-cursor.text=Mark\xF6r
-cursor.mnemonic=M
-
-moveCursor.text=Flytta mark\xF6r
-
-
-############
-# Archetypes
-
-#archetypes.text=
-archetypes.mnemonic=C
-
-
-#########
-# Window
-
-window.text=F\xF6nster
-window.mnemonic=F
-
-nextWindow.text=N\xE4sta
-nextWindow.shortdescription=Visa n\xE4sta f\xF6nster
-
-prevWindow.text=F\xF6reg\xE5ende
-prevWindow.shortdescription=Visa f\xF6reg\xE5ende f\xF6nster
-
-
-#######
# Help
about.title=Om Gridarta for Atrinik
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -117,11 +117,6 @@
#######
# Cursor
-cursor.text=Cursor
-cursor.mnemonic=C
-
-moveCursor.text=Move Cursor
-
goNorth.accel=NUMPAD8
goNorthEast.accel=NUMPAD9
goEast.accel=NUMPAD6
@@ -132,31 +127,6 @@
goNorthWest.accel=NUMPAD7
-############
-# Archetypes
-
-archetypes.text=Archetypes
-archetypes.mnemonic=A
-
-
-#########
-# Window
-
-window.text=Window
-window.mnemonic=W
-
-nextWindow.text=Next Window
-nextWindow.shortdescription=Display next window
-nextWindow.accel=shift pressed PAGE_UP
-
-prevWindow.text=Previous Window
-prevWindow.shortdescription=Display previous window
-prevWindow.accel=shift pressed PAGE_DOWN
-
-
-#######
-# Help
-
about.title=About Gridarta for Crossfire
about=<html><h1 align="center">Gridarta for Crossfire</h1><p>Editor for Crossfire MMORPG maps and arches</p><table><tr><td valign="top" align="right" width="50%">Copyright \xA9 2001-2010</td><td width="50%">Michael Toennies<br>Andreas Vogl<br>Peter Plischewsky<br>Gecko<br>Christian Hujer<br>Daniel Viegas<br>Andreas Kirschbaum</td></tr><tr><td align="right">Java version:</td><td>{0}</td></tr><tr><td align="right">Version:</td><td>{1}</td></tr><tr><td align="right">by:</td><td>{2}</td></tr><tr><td align="right">at:</td><td>{3}</td></tr></table></html>
aboutTab.title=About
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -64,35 +64,6 @@
#######
-# Cursor
-
-cursor.text=Cursor
-cursor.mnemonic=C
-
-moveCursor.text=Cursor bewegen
-
-
-############
-# Archetypes
-
-archetypes.text=Archetypen
-archetypes.mnemonic=T
-
-
-#########
-# Window
-
-window.text=Fenster
-window.mnemonic=F
-
-nextWindow.text=N\xE4chstes Fenster
-nextWindow.shortdescription=Zeige das n\xE4chste Fenster
-
-prevWindow.text=Vorheriges Fenster
-prevWindow.shortdescription=Zeige das vorherige Fenster
-
-
-#######
# Help
about.title=\xDCber Gridarta f\xFCr Crossfire
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -65,35 +65,6 @@
#######
-# Cursor
-
-#cursor.text=
-#cursor.mnemonic=
-
-#moveCursor.text=
-
-
-############
-# Archetypes
-
-archetypes.text=Arches
-archetypes.mnemonic=A
-
-
-#########
-# Window
-
-window.text=Fen\xEAtres
-window.mnemonic=N
-
-nextWindow.text=Fen\xEAtre suivante
-nextWindow.shortdescription=Affiche la fen\xEAtre suivante
-
-prevWindow.text=Fen\xEAtre pr\xE9c\xE9dente
-prevWindow.shortdescription=Affiche la fen\xEAtre pr\xE9c\xE9dente
-
-
-#######
# Help
#about.title=
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -64,35 +64,6 @@
#######
-# Cursor
-
-cursor.text=Mark\xF6r
-cursor.mnemonic=M
-
-moveCursor.text=Flytta mark\xF6r
-
-
-############
-# Archetypes
-
-#archetypes.text=
-archetypes.mnemonic=C
-
-
-#########
-# Window
-
-window.text=F\xF6nster
-window.mnemonic=F
-
-nextWindow.text=N\xE4sta
-nextWindow.shortdescription=Visa n\xE4sta f\xF6nster
-
-prevWindow.text=F\xF6reg\xE5ende
-prevWindow.shortdescription=Visa f\xF6reg\xE5ende f\xF6nster
-
-
-#######
# Help
about.title=Om Gridarta for Crossfire
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -126,11 +126,6 @@
#######
# Cursor
-cursor.text=Cursor
-cursor.mnemonic=C
-
-moveCursor.text=Move Cursor
-
goNorth.accel=NUMPAD9
goNorthEast.accel=NUMPAD6
goEast.accel=NUMPAD3
@@ -141,28 +136,6 @@
goNorthWest.accel=NUMPAD8
-############
-# Archetypes
-
-archetypes.text=Archetypes
-archetypes.mnemonic=A
-
-
-#########
-# Window
-
-window.text=Window
-window.mnemonic=W
-
-nextWindow.text=Next Window
-nextWindow.shortdescription=Display next window
-nextWindow.accel=shift pressed PAGE_UP
-
-prevWindow.text=Previous Window
-prevWindow.shortdescription=Display previous window
-prevWindow.accel=shift pressed PAGE_DOWN
-
-
#######
# Help
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -72,35 +72,6 @@
#######
-# Cursor
-
-cursor.text=Cursor
-cursor.mnemonic=C
-
-moveCursor.text=Cursor bewegen
-
-
-############
-# Archetypes
-
-archetypes.text=Archetypen
-archetypes.mnemonic=T
-
-
-#########
-# Window
-
-window.text=Fenster
-window.mnemonic=F
-
-nextWindow.text=N\xE4chstes Fenster
-nextWindow.shortdescription=Zeige das n\xE4chste Fenster
-
-prevWindow.text=Vorheriges Fenster
-prevWindow.shortdescription=Zeige das vorherige Fenster
-
-
-#######
# Help
about.title=\xDCber Gridarta f\xFCr Daimonin
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -74,35 +74,6 @@
#######
-# Cursor
-
-#cursor.text=
-#cursor.mnemonic=
-
-#moveCursor.text=
-
-
-############
-# Archetypes
-
-archetypes.text=Arches
-archetypes.mnemonic=A
-
-
-#########
-# Window
-
-window.text=Fen\xEAtres
-window.mnemonic=N
-
-nextWindow.text=Fen\xEAtre suivante
-nextWindow.shortdescription=Affiche la fen\xEAtre suivante
-
-prevWindow.text=Fen\xEAtre pr\xE9c\xE9dente
-prevWindow.shortdescription=Affiche la fen\xEAtre pr\xE9c\xE9dente
-
-
-#######
# Help
#about.title=
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -72,35 +72,6 @@
#######
-# Cursor
-
-cursor.text=Mark\xF6r
-cursor.mnemonic=M
-
-moveCursor.text=Flytta mark\xF6r
-
-
-############
-# Archetypes
-
-#archetypes.text=
-archetypes.mnemonic=C
-
-
-#########
-# Window
-
-window.text=F\xF6nster
-window.mnemonic=F
-
-nextWindow.text=N\xE4sta
-nextWindow.shortdescription=Visa n\xE4sta f\xF6nster
-
-prevWindow.text=F\xF6reg\xE5ende
-prevWindow.shortdescription=Visa f\xF6reg\xE5ende f\xF6nster
-
-
-#######
# Help
about.title=Om Gridarta for Daimonin
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -37,6 +37,11 @@
# Menus
# File menu
+cursor.text=Cursor
+cursor.mnemonic=C
+
+moveCursor.text=Move Cursor
+
goNorth.text=Move Cursor North
goNorthEast.text=Move Cursor Northeast
@@ -1188,6 +1193,9 @@
############
# Archetypes
+archetypes.text=Archetypes
+archetypes.mnemonic=A
+
displayGameObjectNames.text=Display game object names
displayArchetypeNames.text=Display archetype names
displayIconsOnly.text=Display icons only
@@ -1196,6 +1204,21 @@
findArchetypes.accel=ctrl alt pressed A
+#########
+# Window
+
+window.text=Window
+window.mnemonic=W
+
+nextWindow.text=Next Window
+nextWindow.shortdescription=Display next window
+nextWindow.accel=shift pressed PAGE_UP
+
+prevWindow.text=Previous Window
+prevWindow.shortdescription=Display previous window
+prevWindow.accel=shift pressed PAGE_DOWN
+
+
########################
# Find archetypes dialog
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -37,6 +37,11 @@
# Menus
# File menu
+cursor.text=Cursor
+cursor.mnemonic=C
+
+moveCursor.text=Cursor bewegen
+
goNorth.text=Cursor nach Nord
goNorthEast.text=Cursor nach Nordost
@@ -1019,6 +1024,9 @@
############
# Archetypes
+archetypes.text=Archetypen
+archetypes.mnemonic=T
+
displayGameObjectNames.text=Objektnamen anzeigen
displayArchetypeNames.text=Archetypnamen anzeigen
displayIconsOnly.text=Bilder anzeigen
@@ -1026,6 +1034,19 @@
findArchetypes.text=Archetypen finden
+#########
+# Window
+
+window.text=Fenster
+window.mnemonic=F
+
+nextWindow.text=N\xE4chstes Fenster
+nextWindow.shortdescription=Zeige das n\xE4chste Fenster
+
+prevWindow.text=Vorheriges Fenster
+prevWindow.shortdescription=Zeige das vorherige Fenster
+
+
########################
# Find archetypes dialog
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -37,6 +37,11 @@
# Menus
# File menu
+#cursor.text=
+#cursor.mnemonic=
+
+#moveCursor.text=
+
#goNorth.text=
#goNorthEast.text=
@@ -1012,6 +1017,9 @@
############
# Archetypes
+archetypes.text=Arches
+archetypes.mnemonic=A
+
#displayGameObjectNames.text=
#displayArchetypeNames.text=
#displayIconsOnly.text=
@@ -1019,6 +1027,19 @@
#findArchetypes.text=
+#########
+# Window
+
+window.text=Fen\xEAtres
+window.mnemonic=N
+
+nextWindow.text=Fen\xEAtre suivante
+nextWindow.shortdescription=Affiche la fen\xEAtre suivante
+
+prevWindow.text=Fen\xEAtre pr\xE9c\xE9dente
+prevWindow.shortdescription=Affiche la fen\xEAtre pr\xE9c\xE9dente
+
+
########################
# Find archetypes dialog
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-18 07:13:29 UTC (rev 7836)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2010-05-18 07:30:36 UTC (rev 7837)
@@ -37,6 +37,11 @@
# Menus
# File menu
+cursor.text=Mark\xF6r
+cursor.mnemonic=M
+
+moveCursor.text=Flytta mark\xF6r
+
goNorth.text=Flytta mark\xF6r norrut
goNorthEast.text=Flytta mark\xF6r nord\xF6st
@@ -1019,6 +1024,9 @@
############
# Archetypes
+#archetypes.text=
+archetypes.mnemonic=C
+
#displayGameObjectNames.text=
#displayArchetypeNames.text=
#displayIconsOnly.text=
@@ -1026,6 +1034,19 @@
#findArchetypes.text=
+#########
+# Window
+
+window.text=F\xF6nster
+window.mnemonic=F
+
+nextWindow.text=N\xE4sta
+nextWindow.shortdescription=Visa n\xE4sta f\xF6nster
+
+prevWindow.text=F\xF6reg\xE5ende
+prevWindow.shortdescription=Visa f\xF6reg\xE5ende f\xF6nster
+
+
########################
# Find archetypes dialog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-05-18 07:13:36
|
Revision: 7836
http://gridarta.svn.sourceforge.net/gridarta/?rev=7836&view=rev
Author: akirschbaum
Date: 2010-05-18 07:13:29 +0000 (Tue, 18 May 2010)
Log Message:
-----------
Remove unused text resource.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -150,14 +150,6 @@
archetypes.mnemonic=A
-#######
-# View
-
-viewShow.text=Show Only
-viewShow.shortdescription=Select some filters to be drawn exclusively
-viewShow.mnemonic=S
-
-
#########
# Window
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_de.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -89,14 +89,6 @@
archetypes.mnemonic=T
-#######
-# View
-
-viewShow.text=Zeige nur
-viewShow.shortdescription=
-viewShow.mnemonic=Z
-
-
#########
# Window
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_fr.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -91,14 +91,6 @@
archetypes.mnemonic=A
-#######
-# View
-
-#viewShow.text=
-#viewShow.shortdescription=
-#viewShow.mnemonic=
-
-
#########
# Window
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/messages_sv.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -89,14 +89,6 @@
archetypes.mnemonic=C
-#######
-# View
-
-viewShow.text=Visa endast
-viewShow.shortdescription=V\xE4lj kategorier att visa exklusivt
-viewShow.mnemonic=V
-
-
#########
# Window
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -148,14 +148,6 @@
archetypes.mnemonic=A
-#######
-# View
-
-viewShow.text=Show Only
-viewShow.shortdescription=Select some filters to be drawn exclusively
-viewShow.mnemonic=S
-
-
#########
# Window
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_de.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -87,14 +87,6 @@
archetypes.mnemonic=T
-#######
-# View
-
-viewShow.text=Zeige nur
-viewShow.shortdescription=
-viewShow.mnemonic=Z
-
-
#########
# Window
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_fr.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -89,14 +89,6 @@
archetypes.mnemonic=A
-#######
-# View
-
-#viewShow.text=
-#viewShow.shortdescription=
-#viewShow.mnemonic=
-
-
#########
# Window
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties 2010-05-17 17:44:58 UTC (rev 7835)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/messages_sv.properties 2010-05-18 07:13:29 UTC (rev 7836)
@@ -87,14 +87,6 @@
archetypes.mnemonic=C
-#######
-# View
-
-viewShow.text=Visa endast
-viewShow.shortdescription=V\xE4lj kategorier att visa exklusivt
-viewShow.mnemonic=V
-
-
#########
# Window
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
