Skip to content

Commit

Permalink
renamed common context java config
Browse files Browse the repository at this point in the history
  • Loading branch information
mhuckaby committed Jan 2, 2015
1 parent ed66876 commit 259f443
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Expand Up @@ -9,7 +9,7 @@
import com.rf1m.image2css.cli.Image2CssOption;
import com.rf1m.image2css.cli.Image2CssOptions;
import com.rf1m.image2css.cli.SystemWrapper;
import com.rf1m.image2css.config.Image2CssCommonContextConfiguration;
import com.rf1m.image2css.config.CommonContextConfiguration;
import com.rf1m.image2css.ioc.CliObjectFactory;
import com.rf1m.image2css.out.ConsoleOutput;
import com.rf1m.image2css.out.CssFileOutput;
Expand All @@ -23,10 +23,10 @@
import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;

import static com.rf1m.image2css.config.Image2CssCommonContextConfiguration.defaultSupportedImageTypes;
import static com.rf1m.image2css.config.CommonContextConfiguration.defaultSupportedImageTypes;

@Configuration
@Import(Image2CssCommonContextConfiguration.class)
@Import(CommonContextConfiguration.class)
@PropertySource(value = {"classpath:/image2css-cli.properties"})
public class Image2CssCliContextConfiguration {

Expand Down
Expand Up @@ -16,7 +16,7 @@ import static java.util.Collections.unmodifiableSet

@Configuration()
@PropertySource(value = ["classpath:/image2css-cmn.properties", "classpath:/image2css-exception-messages.properties"])
class Image2CssCommonContextConfiguration {
class CommonContextConfiguration {

public static final Set<SupportedImageType> defaultSupportedImageTypes =
unmodifiableSet(new HashSet([gif, jpg, png]))
Expand Down
@@ -1,6 +1,6 @@
package com.rf1m.image2css;

import com.rf1m.image2css.config.Image2CssCommonContextConfiguration;
import com.rf1m.image2css.config.CommonContextConfiguration;
import com.rf1m.image2css.ioc.WebObjectFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
Expand All @@ -11,7 +11,7 @@
@Configuration()
@ComponentScan("com.rf1m.image2css.web.controller")
@EnableWebMvc
@Import(Image2CssCommonContextConfiguration.class)
@Import(CommonContextConfiguration.class)
public class Image2CssWebContextConfiguration {

public Image2CssWebContextConfiguration() {
Expand Down

0 comments on commit 259f443

Please sign in to comment.