Permalink
Browse files

Standardize import order and add maven plugin to check

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
  • Loading branch information...
muff1nman committed Jan 14, 2017
1 parent 4dc97f8 commit d6d53ef2f6b205eafbeee94e8e11ad802b733258
Showing with 717 additions and 1,057 deletions.
  1. +25 −0 checkstyle.xml
  2. +4 −0 libresonic-main/pom.xml
  3. +2 −8 libresonic-main/src/main/java/org/json/JSONObject.java
  4. +1 −6 libresonic-main/src/main/java/org/json/JSONTokener.java
  5. +15 −7 libresonic-main/src/main/java/org/libresonic/player/Logger.java
  6. +2 −2 libresonic-main/src/main/java/org/libresonic/player/ajax/ArtistInfo.java
  7. +5 −8 libresonic-main/src/main/java/org/libresonic/player/ajax/ChatService.java
  8. +6 −7 libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java
  9. +4 −5 libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java
  10. +8 −13 libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java
  11. +7 −13 libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java
  12. +2 −2 libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueInfo.java
  13. +9 −34 libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueService.java
  14. +2 −3 libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistInfo.java
  15. +3 −7 libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistService.java
  16. +2 −2 libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java
  17. +0 −1 libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java
  18. +4 −4 libresonic-main/src/main/java/org/libresonic/player/ajax/TransferService.java
  19. +3 −6 libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java
  20. +4 −4 libresonic-main/src/main/java/org/libresonic/player/command/MusicFolderSettingsCommand.java
  21. +1 −1 libresonic-main/src/main/java/org/libresonic/player/command/PasswordSettingsCommand.java
  22. +3 −7 libresonic-main/src/main/java/org/libresonic/player/command/PersonalSettingsCommand.java
  23. +3 −3 libresonic-main/src/main/java/org/libresonic/player/command/PlayerSettingsCommand.java
  24. +5 −3 libresonic-main/src/main/java/org/libresonic/player/command/SearchCommand.java
  25. +5 −5 libresonic-main/src/main/java/org/libresonic/player/controller/AbstractChartController.java
  26. +0 −2 libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
  27. +2 −2 libresonic-main/src/main/java/org/libresonic/player/controller/AllmusicController.java
  28. +4 −9 libresonic-main/src/main/java/org/libresonic/player/controller/AutoCoverDemo.java
  29. +6 −7 libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
  30. +6 −6 libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java
  31. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
  32. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java
  33. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java
  34. +7 −8 libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
  35. +17 −34 libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java
  36. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/EditTagsController.java
  37. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/ExternalPlayerController.java
  38. +1 −5 libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java
  39. +16 −17 libresonic-main/src/main/java/org/libresonic/player/controller/HLSController.java
  40. +9 −11 libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java
  41. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/HomeController.java
  42. +9 −11 libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java
  43. +1 −5 libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java
  44. +2 −5 libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
  45. +13 −14 libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
  46. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/LeftController.java
  47. +1 −3 libresonic-main/src/main/java/org/libresonic/player/controller/LoginController.java
  48. +2 −2 libresonic-main/src/main/java/org/libresonic/player/controller/LyricsController.java
  49. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/M3UController.java
  50. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/MainController.java
  51. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java
  52. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/NowPlayingController.java
  53. +1 −1 libresonic-main/src/main/java/org/libresonic/player/controller/PersonalSettingsController.java
  54. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
  55. +1 −1 libresonic-main/src/main/java/org/libresonic/player/controller/PlayerSettingsController.java
  56. +1 −1 libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistController.java
  57. +9 −19 libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistsController.java
  58. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/PodcastChannelController.java
  59. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/PodcastChannelsController.java
  60. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/PodcastController.java
  61. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/ProxyController.java
  62. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java
  63. +9 −6 libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java
  64. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/RecoverController.java
  65. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
  66. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/SearchController.java
  67. +0 −3 libresonic-main/src/main/java/org/libresonic/player/controller/SettingsController.java
  68. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
  69. +3 −7 libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
  70. +2 −1 libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
  71. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/StarredController.java
  72. +16 −10 libresonic-main/src/main/java/org/libresonic/player/controller/StatusChartController.java
  73. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java
  74. +19 −33 libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java
  75. +1 −1 libresonic-main/src/main/java/org/libresonic/player/controller/TopController.java
  76. +3 −5 libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
  77. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java
  78. +7 −10 libresonic-main/src/main/java/org/libresonic/player/controller/UserChartController.java
  79. +5 −2 libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
  80. +1 −0 libresonic-main/src/main/java/org/libresonic/player/controller/VideoPlayerController.java
  81. +5 −13 libresonic-main/src/main/java/org/libresonic/player/dao/AbstractDao.java
  82. +1 −6 libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java
  83. +2 −1 libresonic-main/src/main/java/org/libresonic/player/dao/DaoHelper.java
  84. +2 −1 libresonic-main/src/main/java/org/libresonic/player/dao/GenericDaoHelper.java
  85. +2 −3 libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java
  86. +2 −3 libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java
  87. +1 −5 libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java
  88. +4 −6 libresonic-main/src/main/java/org/libresonic/player/dao/RatingDao.java
  89. +5 −7 libresonic-main/src/main/java/org/libresonic/player/domain/MediaFile.java
  90. +4 −4 libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolder.java
  91. +3 −7 libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
  92. +0 −2 libresonic-main/src/main/java/org/libresonic/player/domain/PodcastEpisode.java
  93. +2 −3 libresonic-main/src/main/java/org/libresonic/player/domain/SearchResult.java
  94. +2 −2 libresonic-main/src/main/java/org/libresonic/player/domain/TransferStatus.java
  95. +1 −7 libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java
  96. +1 −0 libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java
  97. +7 −13 libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java
  98. +3 −2 libresonic-main/src/main/java/org/libresonic/player/filter/RequestEncodingFilter.java
  99. +4 −3 libresonic-main/src/main/java/org/libresonic/player/filter/ResponseHeaderFilter.java
  100. +12 −6 libresonic-main/src/main/java/org/libresonic/player/i18n/LibresonicLocaleResolver.java
  101. +6 −3 libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java
  102. +5 −9 libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java
  103. +1 −1 libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java
  104. +6 −4 libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java
  105. +1 −0 libresonic-main/src/main/java/org/libresonic/player/security/CsrfSecurityRequestMatcher.java
  106. +1 −0 ...sonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java
  107. +1 −7 libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java
  108. +4 −9 libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java
  109. +10 −17 libresonic-main/src/main/java/org/libresonic/player/service/ITunesParser.java
  110. +3 −10 libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java
  111. +5 −11 libresonic-main/src/main/java/org/libresonic/player/service/LastFmCache.java
  112. +2 −2 libresonic-main/src/main/java/org/libresonic/player/service/LastFmExpirationPolicy.java
  113. +8 −20 libresonic-main/src/main/java/org/libresonic/player/service/LastFmService.java
  114. +6 −17 libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java
  115. +4 −15 libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java
  116. +5 −18 libresonic-main/src/main/java/org/libresonic/player/service/MusicIndexService.java
  117. +9 −10 libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
  118. +8 −9 libresonic-main/src/main/java/org/libresonic/player/service/PlayerService.java
  119. +6 −20 libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java
  120. +9 −21 libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java
  121. +4 −4 libresonic-main/src/main/java/org/libresonic/player/service/RatingService.java
  122. +10 −34 libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
  123. +1 −0 libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java
  124. +1 −9 libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
  125. +7 −8 libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java
  126. +20 −61 libresonic-main/src/main/java/org/libresonic/player/service/SonosService.java
  127. +2 −9 libresonic-main/src/main/java/org/libresonic/player/service/StatusService.java
  128. +9 −15 libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java
  129. +5 −14 libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
  130. +7 −12 libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java
  131. +6 −7 libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java
  132. +1 −0 libresonic-main/src/main/java/org/libresonic/player/service/jukebox/PlayerTest.java
  133. +1 −1 libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java
  134. +2 −2 libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java
  135. +2 −2 libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParser.java
  136. +2 −2 libresonic-main/src/main/java/org/libresonic/player/service/sonos/AlbumList.java
  137. +2 −3 libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosFaultInterceptor.java
  138. +9 −45 libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosHelper.java
  139. +4 −5 libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosServiceRegistration.java
  140. +2 −2 libresonic-main/src/main/java/org/libresonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
  141. +6 −7 libresonic-main/src/main/java/org/libresonic/player/service/upnp/ClingRouter.java
  142. +7 −18 libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java
  143. +1 −2 libresonic-main/src/main/java/org/libresonic/player/service/upnp/LibresonicContentDirectory.java
  144. +3 −2 libresonic-main/src/main/java/org/libresonic/player/spring/LoggingExceptionResolver.java
  145. +1 −0 libresonic-main/src/main/java/org/libresonic/player/taglib/EscapeJavaScriptTag.java
  146. +9 −7 libresonic-main/src/main/java/org/libresonic/player/taglib/FormatBytesTag.java
  147. +2 −2 libresonic-main/src/main/java/org/libresonic/player/taglib/ParamTag.java
  148. +3 −2 libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java
  149. +10 −8 libresonic-main/src/main/java/org/libresonic/player/taglib/WikiTag.java
  150. +10 −5 libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeResolver.java
  151. +3 −4 libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeSource.java
  152. +1 −1 libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItem.java
  153. +1 −1 libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredOutputStream.java
  154. +1 −1 libresonic-main/src/main/java/org/libresonic/player/util/BoundedList.java
  155. +2 −2 libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java
  156. +2 −2 libresonic-main/src/main/java/org/libresonic/player/util/HttpRange.java
  157. +2 −2 libresonic-main/src/main/java/org/libresonic/player/util/Pair.java
  158. +7 −17 libresonic-main/src/main/java/org/libresonic/player/util/StringUtil.java
  159. +6 −11 libresonic-main/src/main/java/org/libresonic/player/util/Util.java
  160. +4 −3 libresonic-main/src/main/java/org/libresonic/player/validator/PasswordSettingsValidator.java
  161. +1 −1 libresonic-main/src/main/java/org/libresonic/player/validator/UserSettingsValidator.java
  162. +2 −2 libresonic-main/src/test/java/org/libresonic/player/controller/HLSControllerTestCase.java
  163. +2 −2 libresonic-main/src/test/java/org/libresonic/player/controller/StreamControllerTestCase.java
  164. +2 −2 libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBase.java
  165. +4 −4 libresonic-main/src/test/java/org/libresonic/player/domain/PlayQueueTestCase.java
  166. +2 −2 libresonic-main/src/test/java/org/libresonic/player/domain/SortableArtistTestCase.java
  167. +1 −0 libresonic-main/src/test/java/org/libresonic/player/domain/TranscodeSchemeTestCase.java
  168. +1 −1 libresonic-main/src/test/java/org/libresonic/player/domain/VersionTestCase.java
  169. +1 −5 libresonic-main/src/test/java/org/libresonic/player/io/RangeOutputStreamTestCase.java
  170. +1 −1 libresonic-main/src/test/java/org/libresonic/player/service/SecurityServiceTestCase.java
  171. +3 −4 libresonic-main/src/test/java/org/libresonic/player/service/SettingsServiceTestCase.java
  172. +2 −2 libresonic-main/src/test/java/org/libresonic/player/service/metadata/MetaDataParserTestCase.java
  173. +1 −7 libresonic-main/src/test/java/org/libresonic/player/util/FileUtils.java
  174. +3 −3 libresonic-main/src/test/java/org/libresonic/player/util/StringUtilTestCase.java
  175. +27 −0 pom.xml
View
@@ -0,0 +1,25 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name = "Checker">
<property name="charset" value="UTF-8"/>
<property name="severity" value="error"/>
<property name="fileExtensions" value="java, properties, xml"/>
<module name="TreeWalker">
<module name="CustomImportOrder">
<property name="customImportOrderRules"
value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
<property name="specialImportsRegExp" value="^javax\."/>
<property name="standardPackageRegExp" value="^java\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="separateLineBetweenGroups" value="true"/>
</module>
<module name="UnusedImports"/>
<module name="RedundantImport"/>
</module>
</module>
View
@@ -394,6 +394,10 @@
<build>
<finalName>libresonic</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -27,15 +27,9 @@ of this software and associated documentation files (the "Software"), to deal
import java.io.IOException;
import java.io.Writer;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
import java.lang.reflect.Modifier;
import java.util.*;
/**
* A JSONObject is an unordered collection of name/value pairs. Its
@@ -1,11 +1,6 @@
package org.json;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.io.*;
/*
Copyright (c) 2002 JSON.org
@@ -19,14 +19,22 @@
*/
package org.libresonic.player;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.libresonic.player.domain.Version;
import org.libresonic.player.service.*;
import org.libresonic.player.util.*;
import org.apache.commons.lang.exception.*;
import java.io.*;
import java.text.*;
import java.util.*;
import org.libresonic.player.service.ServiceLocator;
import org.libresonic.player.service.SettingsService;
import org.libresonic.player.service.VersionService;
import org.libresonic.player.util.BoundedList;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;
/**
* Logger implementation which logs to LIBRESONIC_HOME/libresonic.log.
@@ -19,10 +19,10 @@
package org.libresonic.player.ajax;
import java.util.List;
import org.libresonic.player.domain.ArtistBio;
import java.util.List;
/**
* @author Sindre Mehus
* @version $Id$
@@ -19,20 +19,17 @@
*/
package org.libresonic.player.ajax;
import org.libresonic.player.Logger;
import org.libresonic.player.service.SecurityService;
import org.libresonic.player.util.BoundedList;
import org.apache.commons.lang.StringUtils;
import org.directwebremoting.WebContext;
import org.directwebremoting.WebContextFactory;
import org.libresonic.player.Logger;
import org.libresonic.player.service.SecurityService;
import org.libresonic.player.util.BoundedList;
import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -19,19 +19,12 @@
*/
package org.libresonic.player.ajax;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.libresonic.player.Logger;
import org.libresonic.player.domain.LastFmCoverArt;
import org.libresonic.player.domain.MediaFile;
@@ -40,6 +33,12 @@
import org.libresonic.player.service.SecurityService;
import org.libresonic.player.util.StringUtil;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
/**
* Provides AJAX-enabled services for changing cover art images.
* <p/>
@@ -19,10 +19,6 @@
*/
package org.libresonic.player.ajax;
import java.io.IOException;
import java.io.StringReader;
import java.net.SocketException;
import org.apache.commons.lang.StringUtils;
import org.apache.http.client.ResponseHandler;
import org.apache.http.client.config.RequestConfig;
@@ -34,10 +30,13 @@
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom.input.SAXBuilder;
import org.libresonic.player.Logger;
import org.libresonic.player.util.StringUtil;
import java.io.IOException;
import java.io.StringReader;
import java.net.SocketException;
/**
* Provides AJAX-enabled services for retrieving song lyrics from chartlyrics.com.
* <p/>
@@ -19,25 +19,20 @@
*/
package org.libresonic.player.ajax;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.directwebremoting.WebContextFactory;
import org.libresonic.player.Logger;
import org.libresonic.player.domain.ArtistBio;
import org.libresonic.player.domain.MediaFile;
import org.libresonic.player.domain.MusicFolder;
import org.libresonic.player.domain.UserSettings;
import org.libresonic.player.service.LastFmService;
import org.libresonic.player.service.MediaFileService;
import org.libresonic.player.service.NetworkService;
import org.libresonic.player.service.SecurityService;
import org.libresonic.player.service.SettingsService;
import org.libresonic.player.service.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* Provides miscellaneous AJAX-enabled services.
@@ -19,29 +19,23 @@
*/
package org.libresonic.player.ajax;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
import org.directwebremoting.WebContext;
import org.directwebremoting.WebContextFactory;
import org.libresonic.player.Logger;
import org.libresonic.player.domain.AvatarScheme;
import org.libresonic.player.domain.MediaFile;
import org.libresonic.player.domain.PlayStatus;
import org.libresonic.player.domain.Player;
import org.libresonic.player.domain.UserSettings;
import org.libresonic.player.domain.*;
import org.libresonic.player.service.MediaScannerService;
import org.libresonic.player.service.PlayerService;
import org.libresonic.player.service.SettingsService;
import org.libresonic.player.service.StatusService;
import org.libresonic.player.util.StringUtil;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* Provides AJAX-enabled services for retrieving the currently playing file and directory.
* This class is used by the DWR framework (http://getahead.ltd.uk/dwr/).
@@ -19,10 +19,10 @@
*/
package org.libresonic.player.ajax;
import java.util.List;
import org.libresonic.player.util.StringUtil;
import java.util.List;
/**
* The playlist of a player.
*
@@ -19,46 +19,21 @@
*/
package org.libresonic.player.ajax;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.directwebremoting.WebContextFactory;
import org.springframework.web.servlet.support.RequestContextUtils;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.directwebremoting.WebContextFactory;
import org.libresonic.player.dao.MediaFileDao;
import org.libresonic.player.dao.PlayQueueDao;
import org.libresonic.player.domain.MediaFile;
import org.libresonic.player.domain.MusicFolder;
import org.libresonic.player.domain.PlayQueue;
import org.libresonic.player.domain.Player;
import org.libresonic.player.domain.PodcastEpisode;
import org.libresonic.player.domain.PodcastStatus;
import org.libresonic.player.domain.SavedPlayQueue;
import org.libresonic.player.domain.UrlRedirectType;
import org.libresonic.player.domain.UserSettings;
import org.libresonic.player.service.JukeboxService;
import org.libresonic.player.service.LastFmService;
import org.libresonic.player.service.MediaFileService;
import org.libresonic.player.service.PlayerService;
import org.libresonic.player.domain.*;
import org.libresonic.player.service.*;
import org.libresonic.player.service.PlaylistService;
import org.libresonic.player.service.PodcastService;
import org.libresonic.player.service.RatingService;
import org.libresonic.player.service.SearchService;
import org.libresonic.player.service.SecurityService;
import org.libresonic.player.service.SettingsService;
import org.libresonic.player.service.TranscodingService;
import org.libresonic.player.util.StringUtil;
import org.springframework.web.servlet.support.RequestContextUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
/**
* Provides AJAX-enabled services for manipulating the play queue of a player.
@@ -19,11 +19,10 @@
*/
package org.libresonic.player.ajax;
import java.util.List;
import org.libresonic.player.domain.MediaFile;
import org.libresonic.player.domain.Playlist;
import java.util.List;
/**
* The playlist of a player.
*
@@ -19,6 +19,7 @@
*/
package org.libresonic.player.ajax;
import org.directwebremoting.WebContextFactory;
import org.libresonic.player.dao.MediaFileDao;
import org.libresonic.player.domain.MediaFile;
import org.libresonic.player.domain.MusicFolder;
@@ -29,17 +30,12 @@
import org.libresonic.player.service.PlayerService;
import org.libresonic.player.service.SecurityService;
import org.libresonic.player.service.SettingsService;
import org.directwebremoting.WebContextFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.*;
/**
* Provides AJAX-enabled services for manipulating playlists.
@@ -19,12 +19,12 @@
*/
package org.libresonic.player.ajax;
import org.directwebremoting.WebContext;
import org.directwebremoting.WebContextFactory;
import org.libresonic.player.Logger;
import org.libresonic.player.dao.MediaFileDao;
import org.libresonic.player.domain.User;
import org.libresonic.player.service.SecurityService;
import org.directwebremoting.WebContext;
import org.directwebremoting.WebContextFactory;
/**
* Provides AJAX-enabled services for starring.
Oops, something went wrong.

0 comments on commit d6d53ef

Please sign in to comment.