<NME> findbugs-idea.xml
<BEF> ADDFILE
<MSG> Merge branch 'release' into upstream

<DFF> @@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="org.twodividedbyzero.idea.findbugs">
+    <option name="annotationTypeSettings">
+      <map>
+        <entry key="ExpPriority" value="-16777216;-1;-8355712;WAVE_UNDERSCORE;0;" />
+        <entry key="HighPriority" value="-65536;-1;-65536;WAVE_UNDERSCORE;1;" />
+        <entry key="IgnorePriority" value="-16777216;-1;-8650628;WAVE_UNDERSCORE;0;" />
+        <entry key="LowPriority" value="-16777216;-1;-16711936;BOXED;0;" />
+        <entry key="NormalPriority" value="-16777216;-1;-5066240;WAVE_UNDERSCORE;2;" />
+      </map>
+    </option>
+    <option name="_basePreferences">
+      <map>
+        <entry key="property.analysisEffortLevel" value="default" />
+        <entry key="property.analyzeAfterAutoMake" value="false" />
+        <entry key="property.analyzeAfterCompile" value="false" />
+        <entry key="property.annotationGutterIconEnabled" value="true" />
+        <entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressFBWarnings" />
+        <entry key="property.annotationTextRangeMarkupEnabled" value="true" />
+        <entry key="property.exportAsHtml" value="true" />
+        <entry key="property.exportAsXml" value="true" />
+        <entry key="property.exportBaseDir" value="" />
+        <entry key="property.exportCreateArchiveDir" value="false" />
+        <entry key="property.exportOpenBrowser" value="true" />
+        <entry key="property.minPriorityToReport" value="Medium" />
+        <entry key="property.runAnalysisInBackground" value="false" />
+        <entry key="property.showHiddenDetectors" value="false" />
+        <entry key="property.toolWindowEditorPreview" value="true" />
+        <entry key="property.toolWindowGroupBy" value="BugRank" />
+        <entry key="property.toolWindowToFront" value="false" />
+      </map>
+    </option>
+    <option name="_detectors">
+      <map>
+        <entry key="AbnormalFinallyBlockReturn" value="true" />
+        <entry key="AbstractClassEmptyMethods" value="true" />
+        <entry key="AbstractOverriddenMethod" value="true" />
+        <entry key="AppendingToAnObjectOutputStream" value="true" />
+        <entry key="ArrayBasedCollections" value="true" />
+        <entry key="ArrayIndexOutOfBounds" value="true" />
+        <entry key="ArrayWrappedCallByReference" value="true" />
+        <entry key="AtomicityProblem" value="true" />
+        <entry key="BackportReusePublicIdentifiers" value="true" />
+        <entry key="BadAppletConstructor" value="false" />
+        <entry key="BadHexadecimalConversionDetector" value="true" />
+        <entry key="BadResultSetAccess" value="true" />
+        <entry key="BadSyntaxForRegularExpression" value="true" />
+        <entry key="BadUseOfReturnValue" value="true" />
+        <entry key="BadlyOverriddenAdapter" value="true" />
+        <entry key="BogusExceptionDeclaration" value="true" />
+        <entry key="BooleanReturnNull" value="true" />
+        <entry key="BuildInterproceduralCallGraph" value="false" />
+        <entry key="BuildObligationPolicyDatabase" value="true" />
+        <entry key="BuildStringPassthruGraph" value="true" />
+        <entry key="CallToUnsupportedMethod" value="false" />
+        <entry key="CalledMethods" value="true" />
+        <entry key="CheckCalls" value="false" />
+        <entry key="CheckExpectedWarnings" value="false" />
+        <entry key="CheckImmutableAnnotation" value="true" />
+        <entry key="CheckRelaxingNullnessAnnotation" value="true" />
+        <entry key="CheckTypeQualifiers" value="true" />
+        <entry key="CipherWithNoIntegrityDetector" value="true" />
+        <entry key="CircularDependencies" value="true" />
+        <entry key="CloneIdiom" value="true" />
+        <entry key="CloneUsability" value="true" />
+        <entry key="CollectMethodsReturningImmutableCollections" value="true" />
+        <entry key="CollectStatistics" value="true" />
+        <entry key="CollectionNamingConfusion" value="true" />
+        <entry key="CommandInjectionDetector" value="true" />
+        <entry key="CommonsEqualsBuilderToEquals" value="true" />
+        <entry key="CommonsHashcodeBuilderToHashcode" value="true" />
+        <entry key="CommonsStringBuilderToString" value="true" />
+        <entry key="ComparatorIdiom" value="true" />
+        <entry key="CompareClassNameEquals" value="true" />
+        <entry key="ConflictingTimeUnits" value="true" />
+        <entry key="ConfusedInheritance" value="true" />
+        <entry key="ConfusingArrayAsList" value="true" />
+        <entry key="ConfusingAutoboxedOverloading" value="true" />
+        <entry key="ConfusingFunctionSemantics" value="true" />
+        <entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
+        <entry key="ConstantListIndex" value="true" />
+        <entry key="ContraVariantArrayAssignment" value="true" />
+        <entry key="CookieDetector" value="true" />
+        <entry key="CopiedOverriddenMethod" value="true" />
+        <entry key="CrossSiteScripting" value="true" />
+        <entry key="CustomBuiltXML" value="true" />
+        <entry key="CustomMessageDigestDetector" value="true" />
+        <entry key="CyclomaticComplexity" value="true" />
+        <entry key="DateComparison" value="true" />
+        <entry key="DeclaredRuntimeException" value="true" />
+        <entry key="DefaultEncodingDetector" value="true" />
+        <entry key="DeletingWhileIterating" value="true" />
+        <entry key="DeprecatedTypesafeEnumPattern" value="true" />
+        <entry key="DesUsageDetector" value="true" />
+        <entry key="DoInsideDoPrivileged" value="true" />
+        <entry key="DontCatchIllegalMonitorStateException" value="true" />
+        <entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
+        <entry key="DontUseEnum" value="true" />
+        <entry key="DroppedException" value="true" />
+        <entry key="DubiousListCollection" value="true" />
+        <entry key="DubiousSetOfCollections" value="true" />
+        <entry key="DumbMethodInvocations" value="true" />
+        <entry key="DumbMethods" value="true" />
+        <entry key="DuplicateBranches" value="true" />
+        <entry key="EmptyZipFileEntry" value="false" />
+        <entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
+        <entry key="EsapiEncryptorDetector" value="true" />
+        <entry key="ExceptionSoftening" value="true" />
+        <entry key="ExplicitSerialization" value="true" />
+        <entry key="FieldCouldBeLocal" value="true" />
+        <entry key="FieldItemSummary" value="true" />
+        <entry key="FileUploadFilenameDetector" value="true" />
+        <entry key="FinalParameters" value="true" />
+        <entry key="FinalizerNullsFields" value="true" />
+        <entry key="FindAndroidStream" value="true" />
+        <entry key="FindBadCast2" value="true" />
+        <entry key="FindBadForLoop" value="true" />
+        <entry key="FindBugsSummaryStats" value="true" />
+        <entry key="FindCircularDependencies" value="false" />
+        <entry key="FindDeadLocalStores" value="true" />
+        <entry key="FindDoubleCheck" value="true" />
+        <entry key="FindEmptySynchronizedBlock" value="true" />
+        <entry key="FindFieldSelfAssignment" value="true" />
+        <entry key="FindFinalizeInvocations" value="true" />
+        <entry key="FindFloatEquality" value="true" />
+        <entry key="FindFloatMath" value="false" />
+        <entry key="FindHEmismatch" value="true" />
+        <entry key="FindInconsistentSync2" value="true" />
+        <entry key="FindJSR166LockMonitorenter" value="true" />
+        <entry key="FindLocalSelfAssignment2" value="true" />
+        <entry key="FindMaskedFields" value="true" />
+        <entry key="FindMismatchedWaitOrNotify" value="true" />
+        <entry key="FindNakedNotify" value="true" />
+        <entry key="FindNoSideEffectMethods" value="true" />
+        <entry key="FindNonSerializableStoreIntoSession" value="false" />
+        <entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
+        <entry key="FindNonShortCircuit" value="true" />
+        <entry key="FindNullDeref" value="true" />
+        <entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
+        <entry key="FindOpenStream" value="true" />
+        <entry key="FindPuzzlers" value="true" />
+        <entry key="FindRefComparison" value="true" />
+        <entry key="FindReturnRef" value="true" />
+        <entry key="FindRoughConstants" value="true" />
+        <entry key="FindRunInvocations" value="true" />
+        <entry key="FindSelfComparison" value="true" />
+        <entry key="FindSelfComparison2" value="true" />
+        <entry key="FindSleepWithLockHeld" value="true" />
+        <entry key="FindSpinLoop" value="true" />
+        <entry key="FindSqlInjection" value="true" />
+        <entry key="FindTwoLockWait" value="true" />
+        <entry key="FindUncalledPrivateMethods" value="true" />
+        <entry key="FindUnconditionalWait" value="true" />
+        <entry key="FindUninitializedGet" value="true" />
+        <entry key="FindUnrelatedTypesInGenericContainer" value="true" />
+        <entry key="FindUnreleasedLock" value="true" />
+        <entry key="FindUnsatisfiedObligation" value="true" />
+        <entry key="FindUnsyncGet" value="true" />
+        <entry key="FindUseOfNonSerializableValue" value="true" />
+        <entry key="FindUselessControlFlow" value="true" />
+        <entry key="FloatingPointLoops" value="true" />
+        <entry key="FormatStringChecker" value="true" />
+        <entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
+        <entry key="GoogleApiKeyDetector" value="true" />
+        <entry key="HangingExecutors" value="true" />
+        <entry key="HazelcastSymmetricEncryptionDetector" value="true" />
+        <entry key="HttpClientProblems" value="true" />
+        <entry key="HugeSharedStringConstants" value="true" />
+        <entry key="IDivResultCastToDouble" value="true" />
+        <entry key="ImproperPropertiesUse" value="true" />
+        <entry key="InappropriateToStringUse" value="true" />
+        <entry key="IncompatMask" value="true" />
+        <entry key="InconsistentAnnotations" value="true" />
+        <entry key="InconsistentKeyNameCasing" value="true" />
+        <entry key="IncorrectInternalClassUse" value="true" />
+        <entry key="InefficientIndexOf" value="true" />
+        <entry key="InefficientInitializationInsideLoop" value="true" />
+        <entry key="InefficientMemberAccess" value="false" />
+        <entry key="InefficientStringBuffering" value="true" />
+        <entry key="InefficientToArray" value="true" />
+        <entry key="InfiniteLoop" value="true" />
+        <entry key="InfiniteRecursiveLoop" value="true" />
+        <entry key="InheritanceTypeChecking" value="true" />
+        <entry key="InheritanceUnsafeGetResource" value="true" />
+        <entry key="InitializationChain" value="true" />
+        <entry key="InitializeNonnullFieldsInConstructor" value="true" />
+        <entry key="InstantiateStaticClass" value="true" />
+        <entry key="InsufficientKeySizeBlowfishDetector" value="true" />
+        <entry key="InsufficientKeySizeRsaDetector" value="true" />
+        <entry key="IntCast2LongAsInstant" value="true" />
+        <entry key="InvalidConstantArgument" value="true" />
+        <entry key="InvalidJUnitTest" value="true" />
+        <entry key="IteratorIdioms" value="true" />
+        <entry key="JDBCVendorReliance" value="true" />
+        <entry key="JUnitAssertionOddities" value="true" />
+        <entry key="JaxRsEndpointDetector" value="true" />
+        <entry key="JaxWsEndpointDetector" value="true" />
+        <entry key="JndiCredentialsDetector" value="true" />
+        <entry key="JspXssDetector" value="true" />
+        <entry key="LazyInit" value="true" />
+        <entry key="LdapInjectionDetector" value="true" />
+        <entry key="LingeringGraphicsObjects" value="true" />
+        <entry key="ListIndexedIterating" value="true" />
+        <entry key="LiteralStringComparison" value="true" />
+        <entry key="LoadOfKnownNullValue" value="true" />
+        <entry key="LocalSynchronizedCollection" value="true" />
+        <entry key="LoggerOddities" value="true" />
+        <entry key="LostExceptionStackTrace" value="true" />
+        <entry key="LostLoggerDueToWeakReference" value="true" />
+        <entry key="ManualArrayCopy" value="true" />
+        <entry key="MethodReturnCheck" value="true" />
+        <entry key="MethodReturnsConstant" value="true" />
+        <entry key="Methods" value="true" />
+        <entry key="MisleadingOverloadModel" value="true" />
+        <entry key="ModifyingUnmodifiableCollection" value="true" />
+        <entry key="MoreDumbMethods" value="true" />
+        <entry key="MultithreadedInstanceAccess" value="true" />
+        <entry key="MutableLock" value="true" />
+        <entry key="MutableStaticFields" value="true" />
+        <entry key="Naming" value="true" />
+        <entry key="NeedlessAutoboxing" value="true" />
+        <entry key="NeedlessCustomSerialization" value="true" />
+        <entry key="NeedlessInstanceRetrieval" value="true" />
+        <entry key="NeedlessMemberCollectionSynchronization" value="true" />
+        <entry key="Noise" value="false" />
+        <entry key="NoiseNullDeref" value="false" />
+        <entry key="NonCollectionMethodUse" value="true" />
+        <entry key="NonFunctionalField" value="true" />
+        <entry key="NonOwnedSynchronization" value="true" />
+        <entry key="NonProductiveMethodCall" value="true" />
+        <entry key="NonRecycleableTaglibs" value="true" />
+        <entry key="NonSymmetricEquals" value="true" />
+        <entry key="NoteAnnotationRetention" value="true" />
+        <entry key="NoteCheckReturnValueAnnotations" value="true" />
+        <entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
+        <entry key="NoteJCIPAnnotation" value="true" />
+        <entry key="NoteNonNullAnnotations" value="false" />
+        <entry key="NoteNonnullReturnValues" value="false" />
+        <entry key="NoteSuppressedWarnings" value="true" />
+        <entry key="NoteUnconditionalParamDerefs" value="true" />
+        <entry key="NullCipherDetector" value="true" />
+        <entry key="NumberConstructor" value="true" />
+        <entry key="OptionalReturnNull" value="true" />
+        <entry key="OrphanedDOMNode" value="true" />
+        <entry key="OverlyConcreteParameter" value="true" />
+        <entry key="OverridingEqualsNotSymmetrical" value="true" />
+        <entry key="OverzealousCasting" value="true" />
+        <entry key="ParallelLists" value="true" />
+        <entry key="PartiallyConstructedObjectAccess" value="true" />
+        <entry key="PathTraversalDetector" value="true" />
+        <entry key="PoorMansEnum" value="true" />
+        <entry key="PoorlyDefinedParameter" value="true" />
+        <entry key="PossibleConstantAllocationInLoop" value="true" />
+        <entry key="PossibleIncompleteSerialization" value="true" />
+        <entry key="PossibleMemoryBloat" value="true" />
+        <entry key="PossibleUnsuspectedSerialization" value="true" />
+        <entry key="PossiblyRedundantMethodCalls" value="true" />
+        <entry key="PredictableRandomDetector" value="true" />
+        <entry key="PreferZeroLengthArrays" value="true" />
+        <entry key="PresizeCollections" value="true" />
+        <entry key="PublicSemaphores" value="false" />
+        <entry key="QuestionableBooleanAssignment" value="true" />
+        <entry key="ReDosDetector" value="true" />
+        <entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
+        <entry key="ReadReturnShouldBeChecked" value="true" />
+        <entry key="RedundantInterfaces" value="true" />
+        <entry key="ReflectionOnObjectMethods" value="true" />
+        <entry key="ReflectiveClasses" value="true" />
+        <entry key="RepeatedConditionals" value="true" />
+        <entry key="ResolveAllReferences" value="false" />
+        <entry key="RsaNoPaddingDetector" value="true" />
+        <entry key="RuntimeExceptionCapture" value="true" />
+        <entry key="SQLInLoop" value="true" />
+        <entry key="SaxParserXxeDetector" value="true" />
+        <entry key="ScriptEngineInjectionDetector" value="true" />
+        <entry key="Section508Compliance" value="true" />
+        <entry key="SerializableIdiom" value="true" />
+        <entry key="ServletEndpointDetector" value="true" />
+        <entry key="SideEffectConstructor" value="true" />
+        <entry key="SillynessPotPourri" value="true" />
+        <entry key="SloppyClassReflection" value="true" />
+        <entry key="SluggishGui" value="true" />
+        <entry key="SpelInjectionDetector" value="true" />
+        <entry key="SpoiledChildInterfaceImplementor" value="true" />
+        <entry key="SpringMvcEndpointDetector" value="true" />
+        <entry key="SpuriousThreadStates" value="true" />
+        <entry key="SqlInjectionDetector" value="true" />
+        <entry key="StartInConstructor" value="true" />
+        <entry key="StaticArrayCreatedInMethod" value="true" />
+        <entry key="StaticCalendarDetector" value="true" />
+        <entry key="StaticIvDetector" value="true" />
+        <entry key="StaticMethodInstanceInvocation" value="true" />
+        <entry key="StringConcatenation" value="true" />
+        <entry key="Struts1EndpointDetector" value="true" />
+        <entry key="Struts2EndpointDetector" value="true" />
+        <entry key="StrutsValidatorFormDetector" value="true" />
+        <entry key="SuperfluousInstanceOf" value="true" />
+        <entry key="SuspiciousCloneAlgorithm" value="true" />
+        <entry key="SuspiciousClusteredSessionSupport" value="true" />
+        <entry key="SuspiciousComparatorReturnValues" value="true" />
+        <entry key="SuspiciousGetterSetterUse" value="true" />
+        <entry key="SuspiciousJDKVersionUse" value="true" />
+        <entry key="SuspiciousNullGuard" value="true" />
+        <entry key="SuspiciousThreadInterrupted" value="true" />
+        <entry key="SuspiciousUninitializedArray" value="true" />
+        <entry key="SuspiciousWaitOnConcurrentObject" value="true" />
+        <entry key="SwitchFallthrough" value="true" />
+        <entry key="SyncCollectionIterators" value="true" />
+        <entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
+        <entry key="SynchronizeAndNullCheckField" value="true" />
+        <entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
+        <entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
+        <entry key="TailRecursion" value="true" />
+        <entry key="TapestryEndpointDetector" value="true" />
+        <entry key="TestASM" value="false" />
+        <entry key="TestDataflowAnalysis" value="false" />
+        <entry key="TestingGround" value="false" />
+        <entry key="TestingGround2" value="false" />
+        <entry key="TrainFieldStoreTypes" value="true" />
+        <entry key="TrainLongInstantfParams" value="true" />
+        <entry key="TrainNonNullAnnotations" value="true" />
+        <entry key="TrainUnconditionalDerefParams" value="true" />
+        <entry key="TristateBooleanPattern" value="true" />
+        <entry key="URLProblems" value="true" />
+        <entry key="UnboundMethodTemplateParameter" value="true" />
+        <entry key="UncallableMethodOfAnonymousClass" value="true" />
+        <entry key="UnencryptedSocketDetector" value="true" />
+        <entry key="Unjitable" value="true" />
+        <entry key="UnnecessaryMath" value="true" />
+        <entry key="UnnecessaryNewNullCheck" value="true" />
+        <entry key="UnnecessaryStoreBeforeReturn" value="true" />
+        <entry key="UnreadFields" value="true" />
+        <entry key="UnrelatedCollectionContents" value="true" />
+        <entry key="UnrelatedReturnValues" value="true" />
+        <entry key="UnusedParameter" value="true" />
+        <entry key="UnvalidatedRedirectDetector" value="true" />
+        <entry key="UseAddAll" value="true" />
+        <entry key="UseCharacterParameterizedMethod" value="true" />
+        <entry key="UseEnumCollections" value="true" />
+        <entry key="UseSplit" value="true" />
+        <entry key="UseToArray" value="true" />
+        <entry key="UseVarArgs" value="true" />
+        <entry key="UselessSubclassMethod" value="false" />
+        <entry key="VarArgsProblems" value="true" />
+        <entry key="VolatileUsage" value="true" />
+        <entry key="WaitInLoop" value="true" />
+        <entry key="WeakExceptionMessaging" value="true" />
+        <entry key="WeakFilenameUtilsMethodDetector" value="true" />
+        <entry key="WeakMessageDigestDetector" value="true" />
+        <entry key="WeakTrustManagerDetector" value="true" />
+        <entry key="WicketEndpointDetector" value="true" />
+        <entry key="WriteOnlyCollection" value="true" />
+        <entry key="WrongMapIterator" value="true" />
+        <entry key="XMLFactoryBypass" value="true" />
+        <entry key="XPathInjectionApacheXPathApiDetector" value="true" />
+        <entry key="XPathInjectionJavaxDetector" value="true" />
+        <entry key="XSSRequestWrapperDetector" value="true" />
+        <entry key="XmlDecoderDetector" value="true" />
+      </map>
+    </option>
+    <option name="_reportCategories">
+      <map>
+        <entry key="BAD_PRACTICE" value="true" />
+        <entry key="CORRECTNESS" value="true" />
+        <entry key="EXPERIMENTAL" value="true" />
+        <entry key="I18N" value="true" />
+        <entry key="MALICIOUS_CODE" value="true" />
+        <entry key="MT_CORRECTNESS" value="true" />
+        <entry key="PERFORMANCE" value="true" />
+        <entry key="SECURITY" value="true" />
+        <entry key="STYLE" value="true" />
+      </map>
+    </option>
+    <option name="_includeFilters">
+      <list>
+        <option value="$PROJECT_DIR$/cgeo-calendar/src/cgeo" />
+        <option value="$PROJECT_DIR$/cgeo-contacts/src/cgeo" />
+        <option value="$PROJECT_DIR$/main/src/cgeo" />
+        <option value="$PROJECT_DIR$/tests/src/cgeo" />
+      </list>
+    </option>
+    <option name="_enabledBundledPluginIds">
+      <set>
+        <option value="com.h3xstream.findsecbugs" />
+        <option value="com.mebigfatguy.fbcontrib" />
+        <option value="jp.f.dev.findbugs.detect.android" />
+      </set>
+    </option>
+    <option name="_enabledModuleConfigs">
+      <list>
+        <option value="android-support-v7-appcompat" />
+        <option value="google-play-services_lib" />
+        <option value="mapswithme-api" />
+        <option value="showcaseview" />
+      </list>
+    </option>
+    <option name="_annotationTypeSettings">
+      <map>
+        <entry key="ExpPriority" value="-16777216;-1;-8355712;WAVE_UNDERSCORE;0;" />
+        <entry key="HighPriority" value="-65536;-1;-65536;WAVE_UNDERSCORE;1;" />
+        <entry key="IgnorePriority" value="-16777216;-1;-8650628;WAVE_UNDERSCORE;0;" />
+        <entry key="LowPriority" value="-16777216;-1;-16711936;BOXED;0;" />
+        <entry key="NormalPriority" value="-16777216;-1;-5066240;WAVE_UNDERSCORE;2;" />
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file

Merge branch 'release' into upstream