Merge branch 'develop'

clusterAdminApplication/.checkstyle

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <fileset name="all" enabled="true" check-config-name="Google Checks" local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>

clusterAdminApplication/.classpath

@@ -23,5 +23,22 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

clusterAdminApplication/.gitignore

@@ -1,4 +1,4 @@
 /logs/
 /bin/
-/config.json
+/config*.json
 /target/

clusterAdminApplication/.project

@@ -10,12 +10,20 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments></arguments></buildCommand>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>

clusterAdminApplication/.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+formatter_profile=org.eclipse.jdt.ui.default_profile
+formatter_settings_version=21
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99

clusterAdminApplication/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>ru.yanygin</groupId>
 	<artifactId>ru.yanygin.clusterAdminApplication</artifactId>
-	<version>0.2.0</version>
+	<version>0.3.0</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -47,22 +47,6 @@
     			<finalName>OneS_ClusterAdmin-${project.version}-macOS</finalName>
             </build>
 	    </profile>
-	    <profile>
-	        <id>windows-x86</id>
-	        <activation>
-	            <os>
-	                <family>windows</family>
-	                <arch>x86</arch>
-	            </os>
-	        </activation>
-	        <properties>
-	            <clusterAdminLibrary.artifactId>ru.yanygin.clusterAdminLibrary.windows_x86</clusterAdminLibrary.artifactId>
-	            <swt.artifactId>org.eclipse.swt.win32.win32.x86</swt.artifactId>
-	        </properties>
-	        <build>
-    			<finalName>OneS_ClusterAdmin-${project.version}-windows-x86</finalName>
-            </build>
-	    </profile>
 	    <profile>
 	        <id>windows-x86_64</id>
 	        <activation>
@@ -88,7 +72,7 @@
 		    <groupId>ru.yanygin</groupId>
 <!-- 		    <artifactId>ru.yanygin.clusterAdminLibrary</artifactId> -->
 		    <artifactId>${clusterAdminLibrary.artifactId}</artifactId>
-		    <version>0.2.0-SNAPSHOT</version>
+		    <version>${project.version}-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -285,6 +269,33 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>3.1.2</version>
+				<dependencies>
+					<!-- https://mvnrepository.com/artifact/com.puppycrawl.tools/checkstyle -->
+					<dependency>
+					    <groupId>com.puppycrawl.tools</groupId>
+					    <artifactId>checkstyle</artifactId>
+					    <version>8.44</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+		          <configLocation>google_checks.xml</configLocation>
+		        </configuration>
+				<executions>
+					<execution>
+						<?m2e execute onConfiguration?>
+						<id>validate</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
 		</plugins>
 	</build>

clusterAdminApplication/src/main/java/ru/yanygin/clusterAdminApplication/ClusterAdmin.java

@@ -4,22 +4,27 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/** ClusterAdmin application. */
 public class ClusterAdmin {
 
-	public static void main (String[] args) {
-		Logger LOGGER = LoggerFactory.getLogger("ClusterProvider"); //$NON-NLS-1$
-
-		try {
-			ClusterViewer window = new ClusterViewer();
-			window.setBlockOnOpen(true);
-			window.open();
-			Display.getCurrent().dispose();
-
-		} catch (Exception excp) {
-			excp.printStackTrace();
-			LOGGER.error("Error:", excp); //$NON-NLS-1$
-		}
-
-	}
-
+  private static final Logger LOGGER = LoggerFactory.getLogger("ClusterProvider"); //$NON-NLS-1$
+
+  /**
+   * ClusterAdmin application main.
+   *
+   * @param args - args
+   */
+  public static void main(String[] args) {
+
+    try {
+      ClusterViewer window = new ClusterViewer(null);
+      window.setBlockOnOpen(true);
+      window.open();
+      Display.getCurrent().dispose();
+
+    } catch (Exception excp) {
+      excp.printStackTrace();
+      LOGGER.error("Error:", excp); //$NON-NLS-1$
+    }
+  }
 }