Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions jmsfx-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@
<artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>io.github.ctgnz</groupId>
<artifactId>jmsfx-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.github.ctgnz</groupId>
<artifactId>jmsfx-standard</artifactId>
<scope>runtime</scope>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<!-- JavaFX resolves its native classifier from the build host, so a jar
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.github.ctgnz.jmsfx.server;

import java.util.List;

import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
Expand All @@ -9,6 +11,7 @@
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.format.FormatterRegistry;
import org.springframework.format.datetime.DateFormatter;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
Expand All @@ -17,6 +20,8 @@
import org.thymeleaf.spring6.view.ThymeleafViewResolver;
import org.thymeleaf.templatemode.TemplateMode;

import io.github.ctgnz.jmsfx.server.icon.SymbologyArgumentResolver;

@Configuration
@EnableWebMvc
@ComponentScan
Expand Down Expand Up @@ -50,6 +55,20 @@ public ResourceBundleMessageSource messageSource() {
return messageSource;
}

/**
* Lets a handler take jmsfx-core's interfaces - a {@code SymbolSet}, an {@code Entity} - and have them resolved against the library on the classpath, rather than converted to
* a generated enum. See {@link SymbologyArgumentResolver} for why a converter cannot do it.
*/
@Override
public void addArgumentResolvers(final List<HandlerMethodArgumentResolver> resolvers) {
resolvers.add(symbologyArgumentResolver());
}

@Bean
public SymbologyArgumentResolver symbologyArgumentResolver() {
return new SymbologyArgumentResolver();
}

@Override
public void addFormatters(final FormatterRegistry registry) {
registry.addFormatter(dateFormatter());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package io.github.ctgnz.jmsfx.server;

import java.util.Arrays;

import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.server.ResponseStatusException;

import io.github.ctgnz.jmsfx.IconLibrary;
import io.github.ctgnz.jmsfx.SymbolSet;
import io.github.ctgnz.jmsfx.server.icon.SymbolSetSummary;
import io.github.ctgnz.jmsfx.standard.SymbolSetEnum;

@Controller
public class WebController {
Expand Down Expand Up @@ -54,7 +53,9 @@ public String symbologyPrimer() {
"/browse/{symbolSetId}"
})
public String browseSymbolSet(@PathVariable String symbolSetId, Model model) {
SymbolSetEnum symbolSet = Arrays.stream(SymbolSetEnum.values())
SymbolSet symbolSet = IconLibrary.discover()
.getSymbolSets()
.stream()
.filter(candidate -> candidate.getId()
.equals(symbolSetId))
.findFirst()
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading