Projekt

Obecné

Profil

« Předchozí | Další » 

Revize ba7a20a1

Přidáno uživatelem Michal Linha před téměř 4 roky(ů)

re #8176 removed comparators from controllers, added sorting to configuration manager

Zobrazit rozdíly:

src/main/java/vldc/aswi/web/controller/AssemblyController.java
145 145
            configuration.getParametersInConfiguration().add(parameterInConfiguration);
146 146
        }
147 147

  
148
        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
149

  
150 148
        boolean isNotRemoveEmpty = false;
151 149
        modelMap.addAttribute("isNotRemoveEmpty", isNotRemoveEmpty);
152 150
        modelMap.addAttribute("configuration", configuration);
153
        modelMap.addAttribute("comparator", comparator);
154 151
        modelMap.addAttribute("formAction", "/assembly?assemblyID=" + assembly.getId());
155 152

  
156 153
        return modelAndView;
......
256 253
     * @param modelMap ModelMap to which data is added.
257 254
     */
258 255
    private void addConfigurationDataIntoModelAndView(Configuration newConfiguration, ModelAndView modelAndView, ModelMap modelMap) {
259
        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
260 256
        initializeFields(newConfiguration);
261 257
        modelMap.addAttribute("configuration", newConfiguration);
262
        modelMap.addAttribute("comparator", comparator);
263 258
        modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
264 259
        modelAndView.setViewName("assembly");
265 260
    }

Také k dispozici: Unified diff