Compare commits
5 Commits
544210a811
...
develop
Author | SHA1 | Date | |
---|---|---|---|
6499a4f698
![]() |
|||
05ed5da41b
|
|||
c5f4969666
![]() |
|||
1a9f9a85ab
|
|||
b653652f6d
|
37
Jenkinsfile
vendored
Normal file
37
Jenkinsfile
vendored
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
options {
|
||||||
|
ansiColor('xterm')
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Build') {
|
||||||
|
steps {
|
||||||
|
sh 'mvn -DskipTests clean package'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Test') {
|
||||||
|
steps {
|
||||||
|
sh 'mvn test'
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
junit '*/target/surefire-reports/*.xml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('SonarQube Analysis') {
|
||||||
|
steps {
|
||||||
|
withSonarQubeEnv('KSKE SonarQube') {
|
||||||
|
sh 'mvn org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
archiveArtifacts artifacts: 'client/target/envoy-client-*-shaded.jar, server/target/envoy-server-jar-with-dependencies.jar'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -18,7 +18,7 @@ import envoy.client.util.IconUtil;
|
|||||||
*/
|
*/
|
||||||
public final class ChatControl extends HBox {
|
public final class ChatControl extends HBox {
|
||||||
|
|
||||||
private static final Image userIcon = IconUtil.loadIconThemeSensitive("user_icon", 32),
|
private static Image userIcon = IconUtil.loadIconThemeSensitive("user_icon", 32),
|
||||||
groupIcon = IconUtil.loadIconThemeSensitive("group_icon", 32);
|
groupIcon = IconUtil.loadIconThemeSensitive("group_icon", 32);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -60,4 +60,14 @@ public final class ChatControl extends HBox {
|
|||||||
}
|
}
|
||||||
getStyleClass().add("list-element");
|
getStyleClass().add("list-element");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reloads the default icons.
|
||||||
|
*
|
||||||
|
* @since Envoy Client v0.3-beta
|
||||||
|
*/
|
||||||
|
public static void reloadDefaultChatIcons() {
|
||||||
|
userIcon = IconUtil.loadIconThemeSensitive("user_icon", 32);
|
||||||
|
groupIcon = IconUtil.loadIconThemeSensitive("group_icon", 32);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -326,6 +326,7 @@ public final class ChatScene implements Restorable, KeyboardMapping {
|
|||||||
|
|
||||||
@Event(ThemeChangeEvent.class)
|
@Event(ThemeChangeEvent.class)
|
||||||
private void onThemeChange() {
|
private void onThemeChange() {
|
||||||
|
ChatControl.reloadDefaultChatIcons();
|
||||||
settingsButton.setGraphic(
|
settingsButton.setGraphic(
|
||||||
new ImageView(IconUtil.loadIconThemeSensitive("settings", DEFAULT_ICON_SIZE)));
|
new ImageView(IconUtil.loadIconThemeSensitive("settings", DEFAULT_ICON_SIZE)));
|
||||||
voiceButton.setGraphic(
|
voiceButton.setGraphic(
|
||||||
|
@ -18,10 +18,10 @@ import envoy.util.SerializationUtils;
|
|||||||
* @author Leon Hofmeister
|
* @author Leon Hofmeister
|
||||||
* @since Envoy Common v0.1-beta
|
* @since Envoy Common v0.1-beta
|
||||||
*/
|
*/
|
||||||
class UserTest {
|
public class UserTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void test() throws IOException, ClassNotFoundException {
|
public void test() throws IOException, ClassNotFoundException {
|
||||||
User user2 = new User(2, "kai");
|
User user2 = new User(2, "kai");
|
||||||
User user3 = new User(3, "ai");
|
User user3 = new User(3, "ai");
|
||||||
User user4 = new User(4, "ki", Set.of(user2, user3));
|
User user4 = new User(4, "ki", Set.of(user2, user3));
|
||||||
|
7
pom.xml
7
pom.xml
@ -28,6 +28,13 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<version>3.0.0-M5</version>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
Reference in New Issue
Block a user