Merge branch 'master' into develop
This commit is contained in:
		
							
								
								
									
										76
									
								
								.classpath
									
									
									
									
									
								
							
							
						
						
									
										76
									
								
								.classpath
									
									
									
									
									
								
							| @@ -1,38 +1,38 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <classpath> | ||||
| 	<classpathentry kind="src" output="target/classes" path="src/main/java"> | ||||
| 		<attributes> | ||||
| 			<attribute name="optional" value="true"/> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"> | ||||
| 		<attributes> | ||||
| 			<attribute name="optional" value="true"/> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 			<attribute name="test" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 			<attribute name="test" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="output" path="target/classes"/> | ||||
| </classpath> | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <classpath> | ||||
| 	<classpathentry kind="src" output="target/classes" path="src/main/java"> | ||||
| 		<attributes> | ||||
| 			<attribute name="optional" value="true"/> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"> | ||||
| 		<attributes> | ||||
| 			<attribute name="optional" value="true"/> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 			<attribute name="test" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> | ||||
| 		<attributes> | ||||
| 			<attribute name="maven.pomderived" value="true"/> | ||||
| 			<attribute name="test" value="true"/> | ||||
| 		</attributes> | ||||
| 	</classpathentry> | ||||
| 	<classpathentry kind="output" path="target/classes"/> | ||||
| </classpath> | ||||
|   | ||||
							
								
								
									
										76
									
								
								.project
									
									
									
									
									
								
							
							
						
						
									
										76
									
								
								.project
									
									
									
									
									
								
							| @@ -1,38 +1,38 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <projectDescription> | ||||
| 	<name>envoy-client</name> | ||||
| 	<comment></comment> | ||||
| 	<projects> | ||||
| 	</projects> | ||||
| 	<buildSpec> | ||||
| 		<buildCommand> | ||||
| 			<name>org.eclipse.jdt.core.javabuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.jboss.tools.jst.web.kb.kbbuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.jboss.tools.cdi.core.cdibuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.eclipse.wst.validation.validationbuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.eclipse.m2e.core.maven2Builder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 	</buildSpec> | ||||
| 	<natures> | ||||
| 		<nature>org.eclipse.jdt.core.javanature</nature> | ||||
| 		<nature>org.eclipse.m2e.core.maven2Nature</nature> | ||||
| 	</natures> | ||||
| </projectDescription> | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <projectDescription> | ||||
| 	<name>envoy-client</name> | ||||
| 	<comment></comment> | ||||
| 	<projects> | ||||
| 	</projects> | ||||
| 	<buildSpec> | ||||
| 		<buildCommand> | ||||
| 			<name>org.eclipse.jdt.core.javabuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.jboss.tools.jst.web.kb.kbbuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.jboss.tools.cdi.core.cdibuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.eclipse.wst.validation.validationbuilder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 		<buildCommand> | ||||
| 			<name>org.eclipse.m2e.core.maven2Builder</name> | ||||
| 			<arguments> | ||||
| 			</arguments> | ||||
| 		</buildCommand> | ||||
| 	</buildSpec> | ||||
| 	<natures> | ||||
| 		<nature>org.eclipse.jdt.core.javanature</nature> | ||||
| 		<nature>org.eclipse.m2e.core.maven2Nature</nature> | ||||
| 	</natures> | ||||
| </projectDescription> | ||||
|   | ||||
| @@ -1,129 +1,129 @@ | ||||
| eclipse.preferences.version=1 | ||||
| org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled | ||||
| org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= | ||||
| org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable | ||||
| org.eclipse.jdt.core.compiler.annotation.nullable.secondary= | ||||
| org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled | ||||
| org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||||
| org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate | ||||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 | ||||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||||
| org.eclipse.jdt.core.compiler.compliance=1.8 | ||||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||||
| org.eclipse.jdt.core.compiler.doc.comment.support=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.APILeak=warning | ||||
| org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning | ||||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||||
| org.eclipse.jdt.core.compiler.problem.autoboxing=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning | ||||
| org.eclipse.jdt.core.compiler.problem.deadCode=warning | ||||
| org.eclipse.jdt.core.compiler.problem.deprecation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.discouragedReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||||
| org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning | ||||
| org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning | ||||
| org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning | ||||
| org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning | ||||
| org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadoc=info | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public | ||||
| org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning | ||||
| org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocComments=info | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTags=info | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public | ||||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning | ||||
| org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning | ||||
| org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error | ||||
| org.eclipse.jdt.core.compiler.problem.nullReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error | ||||
| org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning | ||||
| org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning | ||||
| org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning | ||||
| org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning | ||||
| org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning | ||||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning | ||||
| org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning | ||||
| org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info | ||||
| org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedImport=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedLabel=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedLocal=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameter=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning | ||||
| org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning | ||||
| org.eclipse.jdt.core.compiler.release=disabled | ||||
| org.eclipse.jdt.core.compiler.source=1.8 | ||||
| eclipse.preferences.version=1 | ||||
| org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled | ||||
| org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault | ||||
| org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= | ||||
| org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable | ||||
| org.eclipse.jdt.core.compiler.annotation.nullable.secondary= | ||||
| org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled | ||||
| org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||||
| org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate | ||||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 | ||||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||||
| org.eclipse.jdt.core.compiler.compliance=1.8 | ||||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||||
| org.eclipse.jdt.core.compiler.doc.comment.support=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.APILeak=warning | ||||
| org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning | ||||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||||
| org.eclipse.jdt.core.compiler.problem.autoboxing=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning | ||||
| org.eclipse.jdt.core.compiler.problem.deadCode=warning | ||||
| org.eclipse.jdt.core.compiler.problem.deprecation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.discouragedReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||||
| org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning | ||||
| org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning | ||||
| org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning | ||||
| org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning | ||||
| org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadoc=info | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public | ||||
| org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning | ||||
| org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocComments=info | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTags=info | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public | ||||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning | ||||
| org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning | ||||
| org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error | ||||
| org.eclipse.jdt.core.compiler.problem.nullReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error | ||||
| org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning | ||||
| org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning | ||||
| org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning | ||||
| org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning | ||||
| org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning | ||||
| org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning | ||||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning | ||||
| org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning | ||||
| org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info | ||||
| org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedImport=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedLabel=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedLocal=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameter=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled | ||||
| org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning | ||||
| org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore | ||||
| org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning | ||||
| org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning | ||||
| org.eclipse.jdt.core.compiler.release=disabled | ||||
| org.eclipse.jdt.core.compiler.source=1.8 | ||||
| @@ -1,58 +1,58 @@ | ||||
| package envoy.client; | ||||
|  | ||||
| import java.io.Serializable; | ||||
|  | ||||
| import javax.swing.DefaultListModel; | ||||
|  | ||||
| import envoy.schema.Message; | ||||
| import envoy.schema.User; | ||||
|  | ||||
| /** | ||||
|  * Represents a chat between two {@link User}s <br> | ||||
|  * as a list of {@link Message} objects. | ||||
|  * <br> | ||||
|  * Project: <strong>envoy-client</strong><br> | ||||
|  * File: <strong>Chat.java</strong><br> | ||||
|  * Created: <strong>19 Oct 2019</strong><br> | ||||
|  * | ||||
|  * @author Maximilian Käfer | ||||
|  * @author Leon Hofmeister | ||||
|  * @author Kai S. K. Engelbart | ||||
|  * @since Envoy v0.1-alpha | ||||
|  */ | ||||
| public class Chat implements Serializable { | ||||
|  | ||||
| 	private static final long serialVersionUID = -7751248474547242056L; | ||||
|  | ||||
| 	private User						recipient; | ||||
| 	private DefaultListModel<Message>	model	= new DefaultListModel<>(); | ||||
|  | ||||
| 	/** | ||||
| 	 * Provides the list of messages that the recipient receives.<br> | ||||
| 	 * Saves the Messages in the corresponding chat at that Point. | ||||
| 	 * | ||||
| 	 * @param recipient the user who receives the messages | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public Chat(User recipient) { this.recipient = recipient; } | ||||
|  | ||||
| 	/** | ||||
| 	 * @return the recipient of a message | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public User getRecipient() { return recipient; } | ||||
|  | ||||
| 	/** | ||||
| 	 * Adds the received message at the current Point in the current chat | ||||
| 	 * | ||||
| 	 * @param message the message to add in said chat | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public void appendMessage(Message message) { model.addElement(message); } | ||||
|  | ||||
| 	/** | ||||
| 	 * @return all messages in the current chat | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public DefaultListModel<Message> getModel() { return model; } | ||||
| package envoy.client; | ||||
|  | ||||
| import java.io.Serializable; | ||||
|  | ||||
| import javax.swing.DefaultListModel; | ||||
|  | ||||
| import envoy.schema.Message; | ||||
| import envoy.schema.User; | ||||
|  | ||||
| /** | ||||
|  * Represents a chat between two {@link User}s <br> | ||||
|  * as a list of {@link Message} objects. | ||||
|  * <br> | ||||
|  * Project: <strong>envoy-client</strong><br> | ||||
|  * File: <strong>Chat.java</strong><br> | ||||
|  * Created: <strong>19 Oct 2019</strong><br> | ||||
|  * | ||||
|  * @author Maximilian Käfer | ||||
|  * @author Leon Hofmeister | ||||
|  * @author Kai S. K. Engelbart | ||||
|  * @since Envoy v0.1-alpha | ||||
|  */ | ||||
| public class Chat implements Serializable { | ||||
|  | ||||
| 	private static final long serialVersionUID = -7751248474547242056L; | ||||
|  | ||||
| 	private User						recipient; | ||||
| 	private DefaultListModel<Message>	model	= new DefaultListModel<>(); | ||||
|  | ||||
| 	/** | ||||
| 	 * Provides the list of messages that the recipient receives.<br> | ||||
| 	 * Saves the Messages in the corresponding chat at that Point. | ||||
| 	 * | ||||
| 	 * @param recipient the user who receives the messages | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public Chat(User recipient) { this.recipient = recipient; } | ||||
|  | ||||
| 	/** | ||||
| 	 * @return the recipient of a message | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public User getRecipient() { return recipient; } | ||||
|  | ||||
| 	/** | ||||
| 	 * Adds the received message at the current Point in the current chat | ||||
| 	 * | ||||
| 	 * @param message the message to add in said chat | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public void appendMessage(Message message) { model.addElement(message); } | ||||
|  | ||||
| 	/** | ||||
| 	 * @return all messages in the current chat | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public DefaultListModel<Message> getModel() { return model; } | ||||
| } | ||||
| @@ -218,4 +218,4 @@ public class Client { | ||||
| 	 * @since Envoy v0.2-alpha | ||||
| 	 */ | ||||
| 	public boolean isOnline() { return online; } | ||||
| } | ||||
| } | ||||
| @@ -143,4 +143,4 @@ public class Config { | ||||
| 	 * @since Envoy v0.2-alpha | ||||
| 	 */ | ||||
| 	public Level getConsoleLevelBarrier() { return (Level) items.get("consoleLevelBarrier").get(); } | ||||
| } | ||||
| } | ||||
| @@ -334,4 +334,4 @@ public class LocalDB { | ||||
| 	 * @since Envoy v0.2-alpha | ||||
| 	 */ | ||||
| 	public void setUser(User user) { this.user = user; } | ||||
| } | ||||
| } | ||||
							
								
								
									
										156
									
								
								src/main/java/envoy/client/ui/SettingsScreen.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										156
									
								
								src/main/java/envoy/client/ui/SettingsScreen.java
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,156 @@ | ||||
| package envoy.client.ui; | ||||
|  | ||||
| import java.awt.BorderLayout; | ||||
| import java.awt.Color; | ||||
| import java.awt.FlowLayout; | ||||
|  | ||||
| import javax.swing.JButton; | ||||
| import javax.swing.JDialog; | ||||
| import javax.swing.JPanel; | ||||
| import javax.swing.border.EmptyBorder; | ||||
|  | ||||
| /** | ||||
|  * Project: <strong>envoy-client</strong><br> | ||||
|  * File: <strong>SettingsScreen.java</strong><br> | ||||
|  * Created: <strong>31 Oct 2019</strong><br> | ||||
|  *  | ||||
|  * @author Leon Hofmeister | ||||
|  */ | ||||
| public class SettingsScreen extends JDialog { | ||||
|  | ||||
| 	private static final long	serialVersionUID	= -4476913491263077107L; | ||||
| 	private final JPanel		contentPanel		= new JPanel(); | ||||
| 	public static boolean		enterToSend			= true; | ||||
|  | ||||
| 	// TODO: Add a JPanel with all the Information necessary: | ||||
| 	// change (Picture,Username, Email, Password) and toggle(light/dark mode, | ||||
| 	// "ctrl+enter"/"enter" | ||||
| 	// to send a message directly) | ||||
| 	/** | ||||
| 	 * Open the Settings screen. | ||||
| 	 * Only suited for Dev/Error mode. | ||||
| 	 * Avoid usage. | ||||
| 	 *  | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public static void open() { open(new SettingsScreen()); } | ||||
|  | ||||
| 	/** | ||||
| 	 * Opens the Settings screen.<br> | ||||
| 	 * Use preferably since everyone is already initialised.<br> | ||||
| 	 * It personalises the screen more. | ||||
| 	 *  | ||||
| 	 * @param username The name of the User | ||||
| 	 * @param Email    The Email that is associated with that Account | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public static void open(String username) {// , String Email) {AUSKLAMMERN, WENN ANMELDUNG PER | ||||
| 												// EMAIL IMPLEMENTIERT IST! | ||||
| 		open(new SettingsScreen(username)); | ||||
| 	} | ||||
|  | ||||
| 	public static void open(SettingsScreen dialog) { | ||||
| 		dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); | ||||
| 		dialog.setModal(true); | ||||
| 		dialog.setVisible(true); | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Builds the Settings screen.<br> | ||||
| 	 * Use only as Dev/Error Mode.<br> | ||||
| 	 * Avoid usage. | ||||
| 	 *  | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public SettingsScreen() { | ||||
| 		setBackground(Color.BLACK); | ||||
| 		setBounds(100, 100, 450, 300); | ||||
| 		getContentPane().setLayout(new BorderLayout()); | ||||
| 		contentPanel.setBackground(Color.BLACK); | ||||
| 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); | ||||
| 		getContentPane().add(contentPanel, BorderLayout.CENTER); | ||||
| 		contentPanel.setLayout(new BorderLayout(0, 0)); | ||||
| 		{ | ||||
| 			JPanel buttonPane = new JPanel(); | ||||
| 			buttonPane.setBackground(Color.BLACK); | ||||
| 			getContentPane().add(buttonPane, BorderLayout.SOUTH); | ||||
| 			buttonPane.setLayout(new BorderLayout(0, 0)); | ||||
| 			{ | ||||
| 				JButton okButton = new JButton("Save"); | ||||
| 				okButton.setActionCommand("OK"); | ||||
| 				buttonPane.add(okButton, BorderLayout.EAST); | ||||
| 				getRootPane().setDefaultButton(okButton); | ||||
| 				okButton.addActionListener((evt) -> { | ||||
| 					// Hier später die Daten abspeichern, wenn Datenmodell implementiert ist | ||||
| 					dispose(); | ||||
| 				}); | ||||
| 			} | ||||
| 			{ | ||||
| 				JButton cancelButton = new JButton("Cancel"); | ||||
| 				cancelButton.setActionCommand("Cancel"); | ||||
| 				buttonPane.add(cancelButton, BorderLayout.WEST); | ||||
|  | ||||
| 				cancelButton.addActionListener((evt) -> { dispose(); }); | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Builds the Settings screen.<br> | ||||
| 	 * Use preferreably since everyone is already initialised.<br> | ||||
| 	 * It personalises the screen more. | ||||
| 	 *  | ||||
| 	 * @param Username The name of the User | ||||
| 	 * @param Email    The Email that is associated with that Account | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public SettingsScreen(String Username) {// , String Email, String hashedPwd) {AUSKLAMMERN, WENN ANMELDUNG PER EMAIL | ||||
| 											// IMPLEMENTIERT IST! | ||||
| 		setBackground(Color.BLACK); | ||||
| 		setBounds(100, 100, 450, 300); | ||||
| 		getContentPane().setLayout(new BorderLayout()); | ||||
| 		contentPanel.setBackground(Color.BLACK); | ||||
| 		contentPanel.setLayout(new FlowLayout()); | ||||
| 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); | ||||
| 		getContentPane().add(contentPanel, BorderLayout.CENTER); | ||||
| 		{ | ||||
| 			JPanel buttonPane = new JPanel(); | ||||
| 			buttonPane.setBackground(Color.BLACK); | ||||
| 			getContentPane().add(buttonPane, BorderLayout.SOUTH); | ||||
| 			buttonPane.setLayout(new BorderLayout(0, 0)); | ||||
| 			{ | ||||
| 				JButton okButton = new JButton("Save"); | ||||
| 				okButton.setActionCommand("OK"); | ||||
| 				buttonPane.add(okButton, BorderLayout.EAST); | ||||
| 				getRootPane().setDefaultButton(okButton); | ||||
| 				okButton.addActionListener((evt) -> { | ||||
| 					// Hier später die Daten abspeichern, wenn Datenmodell implementiert ist | ||||
| 					dispose(); | ||||
| 				}); | ||||
| 			} | ||||
| 			{ | ||||
| 				JButton cancelButton = new JButton("Cancel"); | ||||
| 				cancelButton.setActionCommand("Cancel"); | ||||
| 				buttonPane.add(cancelButton, BorderLayout.WEST); | ||||
|  | ||||
| 				cancelButton.addActionListener((evt) -> { dispose(); }); | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * @return true if Enter should be used to send a message instead of ctrl+enter | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public static boolean isEnterToSend() { return enterToSend; } | ||||
|  | ||||
| 	/** | ||||
| 	 * @param enterToSend <br> | ||||
| 	 *                    toggles whether a message should be sent via | ||||
| 	 *                    <br> | ||||
| 	 *                    buttonpress "enter" or "ctrl"+"enter" | ||||
| 	 * @since Envoy v0.1-alpha | ||||
| 	 */ | ||||
| 	public static void setEnterToSend(boolean enterForSend) { enterToSend = enterForSend; } | ||||
| 	// TODO: Should be changed to private, but later to avoid warnings | ||||
| } | ||||
		Reference in New Issue
	
	Block a user
	 GitHub
						GitHub