Skip to content

Commit

Permalink
Merge pull request #2 from umjammer/0.0.2
Browse files Browse the repository at this point in the history 
0.0.2
  • Loading branch information
@umjammer
umjammer authored Dec 11, 2022
2 parents 1563d48 + 13e8764 commit aadd7b9
Show file tree
Hide file tree
Showing 49 changed files with 613 additions and 606 deletions.
19 changes: 5 additions & 14 deletions .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
# The branches below must be a subset of the branches above
branches: [master]
# schedule:
# - cron: '0 10 * * 6'
# - cron: '0 6 * * 3'

jobs:
analyze:
Expand All @@ -30,20 +30,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -54,7 +45,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -68,4 +59,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
26 changes: 26 additions & 0 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Java CI

on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Check w/o SNAPSHOT when "bump version"
if: ${{ contains(github.event.head_commit.message, 'bump version') }}
run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT

- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
cache: maven

- name: Build with Maven
run: mvn -B package --file pom.xml
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
tmp/
local.properties
154 changes: 101 additions & 53 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,64 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>vavi</groupId>
<artifactId>vavi-apps-treeview</artifactId>
<version>0.0.2</version>

<name>Vavi TreeView Application</name>
<organization>
<name></name>
<name>vavi</name>
</organization>
<version>0.0.1</version>
<url>https://github.com/umjammer/vavi-apps-treeview</url>
<scm>
<url>https://github.com/umjammer/vavi-apps-treeview</url>
</scm>
<issueManagement>
<url>https://github.com/umjammer/vavi-apps-treeview/issues</url>
</issueManagement>

<profiles>
<profile>
<!-- mvn -P run antrun:run -Dargs='xxx' -->
<id>run</id>
<build>
<plugins>
<plugin>
<!-- GOOD: fork: OK, test jars: OK, user args, default args: OK -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<java classname="sample.Sample" fork="true">
<classpath>
<path refid="maven.compile.classpath"/>
<path refid="maven.test.classpath"/>
</classpath>
<jvmarg value="-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties" />
<jvmarg value="-Dswing.defaultlaf=com.formdev.flatlaf.FlatLightLaf" />
<jvmarg value="-Dapple.laf.useScreenMenuBar=true" />
<jvmarg value="-Dapple.awt.application.name=TreeView" />
<jvmarg value="-Dtv.resource.tree=/sample/tree.xml" />
</java>
</target>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -26,82 +72,84 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
<version>2.0.1</version>
<executions>
<execution>
<goals>
<goal>native2ascii</goal>
<goal>resources</goal>
</goals>
<configuration>
<includes>**/*_ja.properties</includes>
<includes>**/*.properties</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<configuration>
<argLine>
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
</argLine>
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
<versionRange>[1.0-alpha-1,)</versionRange>
<goals>
<goal>native2ascii</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.9.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.github.umjammer</groupId>
<artifactId>vavi-commons</artifactId>
<version>1.0.6</version>
<optional>false</optional>
<version>1.1.8</version>
</dependency>
<dependency>
<groupId>com.github.umjammer</groupId>
<artifactId>vavi-awt</artifactId>
<version>1.0.1</version>
<optional>false</optional>
<version>1.0.6</version>
</dependency>
</dependencies>
<scm>
<url>https://github.com/umjammer/vavi-apps-treeview</url>
</scm>
<issueManagement>
<url>https://github.com/umjammer/vavi-apps-treeview/issues</url>
</issueManagement>
<description>TODO

</description>
<dependency>
<groupId>com.formdev</groupId>
<artifactId>flatlaf</artifactId>
<version>2.6</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
12 changes: 12 additions & 0 deletions readme.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[![Release](https://jitpack.io/v/umjammer/vavi-apps-treeview.svg)](https://jitpack.io/#umjammer/vavi-apps-treeview)
[![Java CI](https://github.com/umjammer/vavi-apps-treeview/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-apps-treeview/actions/workflows/maven.yml)
[![CodeQL](https://github.com/umjammer/vavi-apps-treeview/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/vavi-apps-treeview/actions/workflows/codeql-analysis.yml)
![Java](https://img.shields.io/badge/Java-8-b07219)

# vavi-apps-treeview

🐣 Incubation for tree and application bindings.

## References

* [vavi-commons-sandbox](https://github.com/umjammer/vavi-commons-sandbox):dynamicmorphizm
8 changes: 4 additions & 4 deletions src/main/java/vavi/apps/treeView/TreeNodeInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
public interface TreeNodeInfo extends BeanInfo {

/** */
public static final int ICON_COLOR_16x16_EXT1 = 4;
int ICON_COLOR_16x16_EXT1 = 4;

/** */
public static final int ICON_COLOR_32x32_EXT1 = 5;
int ICON_COLOR_32x32_EXT1 = 5;

/** */
public static final int ICON_COLOR_16x16_EXT2 = 6;
int ICON_COLOR_16x16_EXT2 = 6;

/** */
public static final int ICON_COLOR_32x32_EXT2 = 7;
int ICON_COLOR_32x32_EXT2 = 7;
}

/* */
Loading

0 comments on commit aadd7b9

Please sign in to comment.