Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java Wed Mar 1 06:11:13 2017 @@ -61,11 +61,11 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; /** - * + * * CRUD operations for {@link StringLabel} - * + * * @author solomax, swagner - * + * */ public class LabelDao implements IDataProviderDao<StringLabel>{ private static final Logger log = Red5LoggerFactory.getLogger(LabelDao.class, webAppRootKey); @@ -73,13 +73,13 @@ public class LabelDao implements IDataPr private static final String KEY_ATTR = "key"; public static final String APP_RESOURCES_EN = "Application.properties.xml"; public static final String APP_RESOURCES = "Application_%s.properties.xml"; - public static final LinkedHashMap<Long, Locale> languages = new LinkedHashMap<Long, Locale>(); //TODO hide it and return unmodifiable map - public static final ConcurrentHashMap<Locale, List<StringLabel>> labelCache = new ConcurrentHashMap<Locale, List<StringLabel>>(); - public static final Set<String> keys = new HashSet<String>(); + public static final LinkedHashMap<Long, Locale> languages = new LinkedHashMap<>(); //TODO hide it and return unmodifiable map + public static final ConcurrentHashMap<Locale, List<StringLabel>> labelCache = new ConcurrentHashMap<>(); + public static final Set<String> keys = new HashSet<>(); private static Class<?> APP = null; public List<Map<String, Object>> getStrings(Long language_id, int start, int count) { - List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> result = new ArrayList<>(); for (int i = 0; i < count; ++i) { Map<String, Object> map = new HashMap<>(); map.put("id", start + i); @@ -88,7 +88,7 @@ public class LabelDao implements IDataPr } return result; } - + private static void storeLanguages() throws Exception { Document d = XmlExport.createDocument(); Element r = XmlExport.createRoot(d, "language"); @@ -97,7 +97,7 @@ public class LabelDao implements IDataPr } XmlExport.toXml(getLangFile(), d); } - + public static void add(Locale l) throws Exception { long id = 0L; for (Map.Entry<Long, Locale> e : languages.entrySet()) { @@ -107,7 +107,7 @@ public class LabelDao implements IDataPr storeLanguages(); labelCache.put(l, new ArrayList<StringLabel>()); } - + public String getString(long fieldValuesId, long langId) { return ensureApplication(langId).getOmString(fieldValuesId, langId); } @@ -119,7 +119,7 @@ public class LabelDao implements IDataPr private static File getLangFile() { return new File(OmFileHelper.getLanguagesDir(), OmFileHelper.nameOfLanguageFile); } - + public static synchronized Class<?> getAppClass() throws ClassNotFoundException { if (APP == null) { //FIXME HACK to resolve package dependencies @@ -127,7 +127,7 @@ public class LabelDao implements IDataPr } return APP; } - + public static void initLanguageMap() { SAXReader reader = new SAXReader(); try { @@ -156,7 +156,7 @@ public class LabelDao implements IDataPr } return name; } - + private static void storeLabels(Locale l) throws Exception { Document d = XmlExport.createDocument(); Element r = XmlExport.createRoot(d); @@ -167,7 +167,7 @@ public class LabelDao implements IDataPr URL u = APP.getResource(getLabelFileName(l)); XmlExport.toXml(new File(u.toURI()), d); } - + public static void upload(Locale l, InputStream is) throws Exception { List<StringLabel> labels = getLabels(is); URL u = APP.getResource(getLabelFileName(Locale.ENGLISH)); //get the URL of existing resource @@ -179,9 +179,9 @@ public class LabelDao implements IDataPr labelCache.put(l, labels); storeLabels(l); } - + private static List<StringLabel> getLabels(Locale l) { - List<StringLabel> labels = new ArrayList<StringLabel>(); + List<StringLabel> labels = new ArrayList<>(); try (InputStream is = APP.getResourceAsStream(getLabelFileName(l))) { labels = getLabels(is); } catch (Exception e) { @@ -189,9 +189,9 @@ public class LabelDao implements IDataPr } return labels; } - + private static List<StringLabel> getLabels(InputStream is) throws Exception { - final List<StringLabel> labels = new ArrayList<StringLabel>(); + final List<StringLabel> labels = new ArrayList<>(); SAXParserFactory spf = SAXParserFactory.newInstance(); spf.setNamespaceAware(true); try { @@ -199,45 +199,45 @@ public class LabelDao implements IDataPr XMLReader xr = parser.getXMLReader(); xr.setContentHandler(new ContentHandler() { StringLabel label = null; - + @Override public void startPrefixMapping(String prefix, String uri) throws SAXException {} - + @Override public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException { if (ENTRY_ELEMENT.equals(localName)) { label = new StringLabel(atts.getValue(KEY_ATTR), ""); } } - + @Override public void startDocument() throws SAXException {} - + @Override public void skippedEntity(String name) throws SAXException {} - + @Override public void setDocumentLocator(Locator locator) {} - + @Override public void processingInstruction(String target, String data) throws SAXException {} - + @Override public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {} - + @Override public void endPrefixMapping(String prefix) throws SAXException {} - + @Override public void endElement(String uri, String localName, String qName) throws SAXException { if (ENTRY_ELEMENT.equals(localName)) { labels.add(label); } } - + @Override public void endDocument() throws SAXException {} - + @Override public void characters(char[] ch, int start, int length) throws SAXException { StringBuilder sb = new StringBuilder(label.getValue()); @@ -251,7 +251,7 @@ public class LabelDao implements IDataPr } return labels; } - + private static List<StringLabel> getLabels(Locale l, final String search) { if (!labelCache.containsKey(l)) { List<StringLabel> ll = getLabels(l); @@ -270,7 +270,7 @@ public class LabelDao implements IDataPr } return result; } - + @Override public StringLabel get(long id) { throw new RuntimeException("Should not be used"); @@ -314,7 +314,7 @@ public class LabelDao implements IDataPr } return result.subList(start, start + count > result.size() ? result.size() : start + count); } - + @Override public long count() { throw new RuntimeException("Should not be used"); @@ -343,12 +343,12 @@ public class LabelDao implements IDataPr storeLabels(l); return entity; } - + @Override public void delete(StringLabel entity, Long userId) { throw new RuntimeException("Should not be used"); } - + public void delete(Locale l, StringLabel entity) throws Exception { List<StringLabel> labels = labelCache.get(l); if (labels.contains(entity)) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/ClientDao.java Wed Mar 1 06:11:13 2017 @@ -32,18 +32,18 @@ import org.springframework.transaction.a /** * Persistence of client objects to database is only available if so configured! - * + * * @author sebawagner * */ @Transactional public class ClientDao { - + @PersistenceContext private EntityManager em; - - private static List<Long> EMPTY_LIST = new ArrayList<Long>(0); - + + private static List<Long> EMPTY_LIST = new ArrayList<>(0); + public void cleanAllClients() { em.createNamedQuery("deleteAll").executeUpdate(); } @@ -53,34 +53,34 @@ public class ClientDao { setParameter("server", server). executeUpdate(); } - + public Client add(Client entity) { em.persist(entity); return entity; } - + public Client update(Client entity) { em.merge(entity); return entity; } - + public void delete(Client entity) { Query q = em.createNamedQuery("deletedById"); q.setParameter("id", entity.getId()); q.executeUpdate(); } - + public void removeClientByServerAndStreamId(Server server, String streamId) { Query q = em.createNamedQuery("deletedByServerAndStreamId"); q.setParameter("server", server); q.setParameter("streamid", streamId); q.executeUpdate(); } - + public int countClients() { return em.createNamedQuery("countClients", Long.class).getSingleResult().intValue(); } - + public int countClientsByServer(Server server) { TypedQuery<Long> q = em.createNamedQuery("countClientsByServer", Long.class); q.setParameter("server", server); @@ -95,9 +95,9 @@ public class ClientDao { } /** - * Query.getSingleResult would throw an error if result is null, + * Query.getSingleResult would throw an error if result is null, * see: http://stackoverflow.com/questions/2002993/jpa-getsingleresult-or-null - * + * * @param server * @param streamId * @return @@ -130,14 +130,14 @@ public class ClientDao { public List<Client> getClientsByServer(Server server) { TypedQuery<Client> q = em.createNamedQuery("getClientsByServer", Client.class); - q.setParameter("server", server); + q.setParameter("server", server); return q.getResultList(); } public List<Client> getClients() { return em.createNamedQuery("getClients", Client.class).getResultList(); } - + public List<Client> getClientsWithServer() { return em.createNamedQuery("getClientsWithServer", Client.class).getResultList(); } @@ -145,19 +145,19 @@ public class ClientDao { public List<Client> getClientsByUserId(Server server, Long userId) { TypedQuery<Client> q = em.createNamedQuery("getClientsByUserId", Client.class); q.setParameter("server", server); - q.setParameter("userId", userId); + q.setParameter("userId", userId); return q.getResultList(); } public List<Client> getClientsByRoomId(Long roomId) { TypedQuery<Client> q = em.createNamedQuery("getClientsByRoomId", Client.class); - q.setParameter("roomId", roomId); + q.setParameter("roomId", roomId); return q.getResultList(); } /** * returns a list of servers or an empty list in case no roomIds are found - * + * * @param server * @return */ @@ -166,7 +166,7 @@ public class ClientDao { q.setParameter("server", server); @SuppressWarnings("unchecked") List<Long> resultList = q.getResultList(); - //if the result list contains only a value null, it means it + //if the result list contains only a value null, it means it //was empty and no roomid's have been found if (resultList.size() == 1 && resultList.get(0) == null) { return EMPTY_LIST; Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java Wed Mar 1 06:11:13 2017 @@ -41,10 +41,10 @@ import org.springframework.transaction.a /** * Insert/Update/Delete {@link LdapConfig} - * - * + * + * * @author swagner - * + * */ @Transactional public class LdapConfigDao implements IDataProviderDao<LdapConfig> { @@ -61,7 +61,7 @@ public class LdapConfigDao implements ID public LdapConfig get(long id) { return get(Long.valueOf(id)); } - + @Override public LdapConfig get(Long id) { try { @@ -96,11 +96,11 @@ public class LdapConfigDao implements ID public List<LdapConfig> get() { //Add localhost Domain LdapConfig ldapConfig = new LdapConfig(); - + ldapConfig.setName("local DB [internal]"); ldapConfig.setId(-1L); - List<LdapConfig> result = new ArrayList<LdapConfig>(); + List<LdapConfig> result = new ArrayList<>(); result.add(ldapConfig); result.addAll(getActive()); return result; @@ -121,7 +121,7 @@ public class LdapConfigDao implements ID q.setMaxResults(count); return q.getResultList(); } - + @Override public long count() { try { @@ -140,7 +140,7 @@ public class LdapConfigDao implements ID TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("LdapConfig", "lc", search, true, true, null, searchFields), Long.class); return q.getSingleResult(); } - + @Override public LdapConfig update(LdapConfig entity, Long userId) { try { Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Wed Mar 1 06:11:13 2017 @@ -89,7 +89,7 @@ public class UserDao implements IGroupAd private TimezoneUtil timezoneUtil; public static Set<Right> getDefaultRights() { - Set<Right> rights = new HashSet<User.Right>(); + Set<Right> rights = new HashSet<>(); rights.add(Right.Login); rights.add(Right.Dashboard); rights.add(Right.Room); @@ -157,7 +157,7 @@ public class UserDao implements IGroupAd } public List<User> get(String search, int start, int count, String sort, boolean filterContacts, Long currentUserId) { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", getAdditionalJoin(filterContacts), search, true, true, false , getAdditionalWhere(filterContacts, currentUserId, params), sort, searchFields), User.class); q.setFirstResult(start); @@ -193,7 +193,7 @@ public class UserDao implements IGroupAd } public long count(String search, boolean filterContacts, Long currentUserId) { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", getAdditionalJoin(filterContacts), search, true, true, true , getAdditionalWhere(filterContacts, currentUserId, params), null, searchFields), Long.class); setAdditionalParams(q, params); @@ -210,7 +210,7 @@ public class UserDao implements IGroupAd //This is AdminDao method public List<User> get(String search, boolean excludeContacts, int first, int count) { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", null, search, true, true, false , getAdditionalWhere(excludeContacts, params), null, searchFields), User.class); setAdditionalParams(q, params); @@ -220,7 +220,7 @@ public class UserDao implements IGroupAd } public List<User> get(String search, boolean filterContacts, Long currentUserId) { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", getAdditionalJoin(filterContacts), search, true, true, false , getAdditionalWhere(filterContacts, currentUserId, params), null, searchFields), User.class); setAdditionalParams(q, params); @@ -530,7 +530,7 @@ public class UserDao implements IGroupAd } private <T> TypedQuery<T> getUserProfileQuery(Class<T> clazz, Long userId, String text, String offers, String search, String orderBy, boolean asc) { - Map<String, Object> params = new HashMap<String, Object>(); + Map<String, Object> params = new HashMap<>(); boolean filterContacts = true; boolean count = clazz.isAssignableFrom(Long.class); @@ -592,7 +592,7 @@ public class UserDao implements IGroupAd } public Set<Right> getRights(Long id) { - Set<Right> rights = new HashSet<Right>(); + Set<Right> rights = new HashSet<>(); if (id == null) { return rights; Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java Wed Mar 1 06:11:13 2017 @@ -31,12 +31,12 @@ public class RoomSearchResult { private Long errorId; public RoomSearchResult() {} - + public RoomSearchResult(SearchResult<Room> copy) { if (copy != null) { this.objectName = copy.getObjectName(); this.records = copy.getRecords(); - this.result = new ArrayList<RoomDTO>(copy.getResult().size()); + this.result = new ArrayList<>(copy.getResult().size()); for (Room r : copy.getResult()) { result.add(new RoomDTO(r)); } Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java Wed Mar 1 06:11:13 2017 @@ -29,19 +29,19 @@ public class UserSearchResult { private Long records; private List<UserDTO> result; private Long errorId; - + public UserSearchResult() {} public UserSearchResult(SearchResult<User> copy) { this.objectName = copy.getObjectName(); this.records = copy.getRecords(); - this.result = new ArrayList<UserDTO>(copy.getResult().size()); + this.result = new ArrayList<>(copy.getResult().size()); for (User u : copy.getResult()) { result.add(new UserDTO(u)); } this.errorId = copy.getErrorId(); } - + public String getObjectName() { return objectName; } Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Wed Mar 1 06:11:13 2017 @@ -282,7 +282,7 @@ public class Room implements IDataProvid @JoinColumn(name = "roomId") @ForeignKey(enabled = true) @ElementList(name = "room_moderators", required=false) - private List<RoomModerator> moderators = new ArrayList<RoomModerator>(); + private List<RoomModerator> moderators = new ArrayList<>(); @Column(name = "sip_enabled", nullable = false) @Element(data = true, required = false) Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Wed Mar 1 06:11:13 2017 @@ -65,30 +65,30 @@ public class RoomPoll implements IDataPr private static final long serialVersionUID = 1L; public static final int YES_NO_TYPE_ID = 1; public static final int NUMERIC_TYPE_ID = 2; - + @XmlType(namespace="org.apache.openmeetings.room.poll.type") public enum Type { yesNo , numeric; private int id; - + Type() {} //default; Type(int id) { this.id = id; } - + public int getId() { return id; } - + public static Type get(Long type) { return get(type == null ? 1 : type.intValue()); } - + public static Type get(Integer type) { return get(type == null ? 1 : type.intValue()); } - + public static Type get(int type) { Type rt = Type.yesNo; switch (type) { @@ -101,16 +101,16 @@ public class RoomPoll implements IDataPr return rt; } } - + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Long id; - + @Column(name = "name") @Element(name = "pollname", data = true, required = false) private String name; - + @Column(name = "question") @Element(name = "pollquestion", data = true, required = false) private String question; @@ -122,12 +122,12 @@ public class RoomPoll implements IDataPr @Column(name = "archived", nullable = false) @Element(data = true, required = false) private boolean archived; - + @Column(name = "type") @Element(name = "polltypeid", data = true, required = false) @Enumerated(EnumType.STRING) private Type type; - + @OneToOne(fetch = FetchType.EAGER) @JoinColumn(name = "user_id") @ForeignKey(enabled = true) @@ -195,7 +195,7 @@ public class RoomPoll implements IDataPr */ public List<RoomPollAnswer> getAnswers() { if (answers == null) { - answers = new LinkedList<RoomPollAnswer>(); + answers = new LinkedList<>(); } return answers; } Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java Wed Mar 1 06:11:13 2017 @@ -36,12 +36,12 @@ import org.apache.commons.cli.Options; public class OmHelpFormatter extends HelpFormatter { private static String GENERAL_OPTION_GROUP = ""; private int maxPrefixLength = 0; - + @SuppressWarnings("unchecked") private static List<OmOption> getReqOptions(Options opts) { //suppose we have only 1 group (for now) OptionGroup g = ((List<OptionGroup>)opts.getRequiredOptions()).get(0); - List<OmOption> result = new ArrayList<OmOption>(); + List<OmOption> result = new ArrayList<>(); for (Option o : g.getOptions()) { result.add((OmOption)o); } @@ -53,13 +53,13 @@ public class OmHelpFormatter extends Hel }); return result; } - - private LinkedHashMap<String, List<OmOption>> getOptions(Options opts, int leftPad) { + + private Map<String, List<OmOption>> getOptions(Options opts, int leftPad) { final String longOptSeparator = " "; final String lpad = createPadding(leftPad); final String lpadParam = createPadding(leftPad + 2); List<OmOption> reqOptions = getReqOptions(opts); - LinkedHashMap<String, List<OmOption>> map = new LinkedHashMap<String, List<OmOption>>(reqOptions.size()); + Map<String, List<OmOption>> map = new LinkedHashMap<>(reqOptions.size()); map.put(GENERAL_OPTION_GROUP, new ArrayList<OmOption>()); for (OmOption o : reqOptions) { map.put(o.getOpt(), new ArrayList<OmOption>()); @@ -69,7 +69,7 @@ public class OmHelpFormatter extends Hel //TODO need better check (required option should go first and should not be duplicated boolean skipOption = map.containsKey(o.getOpt()); boolean mainOption = skipOption || o.getGroup() == null; - + // first create list containing only <lpad>-a,--aaa where // -a is opt and --aaa is long opt; in parallel look for // the longest opt string this list will be then used to @@ -103,7 +103,7 @@ public class OmHelpFormatter extends Hel o.setHelpPrefix(optBuf); maxPrefixLength = Math.max(optBuf.length(), maxPrefixLength); - + if (skipOption) { //TODO need better check (required option should go first and should not be duplicated continue; @@ -125,7 +125,7 @@ public class OmHelpFormatter extends Hel boolean o2opt = !o2.isOptional(key); return (o1opt && o2opt || !o1opt && !o2opt) ? (o1.getOpt() == null ? 1 : -1) : (o1opt ? -1 : 1); } - + }); if (opts.hasOption(key)) { options.add(0, (OmOption)opts.getOption(key)); @@ -133,7 +133,7 @@ public class OmHelpFormatter extends Hel } return map; } - + private static StringBuilder getReqOptionsString(Options opts) { String delim = ""; StringBuilder result = new StringBuilder(); @@ -143,13 +143,13 @@ public class OmHelpFormatter extends Hel } return result; } - + @Override protected StringBuffer renderOptions(StringBuffer sb, int width, Options options, int leftPad, int descPad) { final String dpad = createPadding(descPad); final String optional = "(optional) "; - LinkedHashMap<String, List<OmOption>> optList = getOptions(options, leftPad); + Map<String, List<OmOption>> optList = getOptions(options, leftPad); char[] delimiter = new char[width - 2]; Arrays.fill(delimiter, '-'); Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java Wed Mar 1 06:11:13 2017 @@ -76,10 +76,10 @@ public class OmOption extends Option { public void setOptional(boolean val) { setOptional(group, val); } - + public void setOptional(String group, boolean val) { String[] grps = group.split(","); - optional = new HashMap<String, Boolean>(grps.length); + optional = new HashMap<>(grps.length); for(String g : grps) { optional.put(g, val); } Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/CaptureScreen.java Wed Mar 1 06:11:13 2017 @@ -25,6 +25,7 @@ import static org.quartz.SimpleScheduleB import static org.slf4j.LoggerFactory.getLogger; import java.io.IOException; +import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -58,7 +59,7 @@ public class CaptureScreen extends Threa private volatile boolean active = true; private IScreenEncoder se; private IScreenShare client; - private ArrayBlockingQueue<VideoData> frames = new ArrayBlockingQueue<VideoData>(2); + private Queue<VideoData> frames = new ArrayBlockingQueue<>(2); private String host = null; private String app = null; private int port = -1; @@ -132,14 +133,14 @@ public class CaptureScreen extends Threa log.error("Error while running: ", e); } } - + /* private void pushAudio(byte[] audio, long ts) { if (startPublish) { buffer.put((byte) 6); buffer.put(audio); buffer.flip(); - + // I can stream audio //packets successfully using linear PCM at 11025Hz. For those packets I //push one byte (0x06) which specifies the format of audio data in a @@ -149,7 +150,7 @@ public class CaptureScreen extends Threa } } */ - + public void pushVideo(VideoData data, int ts) throws IOException { if (startPublish) { if (Red5.getConnectionLocal() == null) { @@ -188,7 +189,7 @@ public class CaptureScreen extends Threa return se; } - public ArrayBlockingQueue<VideoData> getFrames() { + public Queue<VideoData> getFrames() { return frames; } Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java Wed Mar 1 06:11:13 2017 @@ -76,7 +76,7 @@ public class Core implements IPendingSer private String host; private String app; private int port; - + public String publishName; private CaptureScreen _capture = null; private RTMPClientPublish publishClient = null; @@ -219,7 +219,7 @@ public class Core implements IPendingSer int x = (int)(Ampl_factor * (mouseP.getX() - spinnerX) * scaleFactor); int y = (int)(Ampl_factor * (mouseP.getY() - spinnerY) * scaleFactor); - Map<String, Object> cursorPosition = new HashMap<String, Object>(); + Map<String, Object> cursorPosition = new HashMap<>(); cursorPosition.put("publicSID", publishName); cursorPosition.put("cursor_x", x); cursorPosition.put("cursor_y", y); @@ -247,7 +247,7 @@ public class Core implements IPendingSer if (Red5.getConnectionLocal() == null) { Red5.setConnectionLocal(instance.getConnection()); } - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("screenX", spinnerX); map.put("screenY", spinnerY); @@ -282,28 +282,28 @@ public class Core implements IPendingSer startSharing = true; captureScreenStart(); } - + public void recordingStart() { startRecording= true; captureScreenStart(); } - + public void publishingStart() { startPublishing = true; captureScreenStart(); } - + private void connect(String parentSid) { Map<String, Object> map = instance.makeDefaultConnectionParams(host, port, app); map.put("screenClient", true); map.put("parentSid", parentSid); instance.connect(host, port, map, this); } - + private void captureScreenStart() { try { log.debug("captureScreenStart"); - + if (!isConnected) { connect(publishName); } else { @@ -324,22 +324,22 @@ public class Core implements IPendingSer startSharing = false; captureScreenStop("stopStreaming"); } - + public void recordingStop() { startRecording = false; captureScreenStop("stopRecording"); } - + public void publishingStop() { startPublishing = false; captureScreenStop("stopPublishing"); } - + private void captureScreenStop(String action) { try { log.debug("INVOKE screenSharerAction" ); - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put(action, true); if (Red5.getConnectionLocal() == null) { @@ -361,12 +361,12 @@ public class Core implements IPendingSer frame.setSharingStatus(false, !startPublishing && !startRecording && !startSharing); startSharing = false; } - + public void stopRecording() { frame.setRecordingStatus(false, !startPublishing && !startRecording && !startSharing); startRecording = false; } - + public void stopPublishing() { frame.setPublishingStatus(false, !startPublishing && !startRecording && !startSharing); startPublishing = false; @@ -375,15 +375,15 @@ public class Core implements IPendingSer publishClient = null; } } - + synchronized public boolean isReadyToRecord() { return readyToRecord; } - + synchronized private void setReadyToRecord(boolean readyToRecord) { this.readyToRecord = readyToRecord; } - + protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { if (!(command instanceof Notify)) { return; @@ -392,7 +392,7 @@ public class Core implements IPendingSer if (invoke.getType() == IEvent.Type.STREAM_DATA) { return; } - + String method = invoke.getCall().getServiceMethodName(); if ("screenSharerAction".equals(method)) { Object[] args = invoke.getCall().getArguments(); @@ -446,7 +446,7 @@ public class Core implements IPendingSer private static boolean bool(Object b) { return TRUE.equals(Boolean.valueOf("" + b)); } - + public void sendRemoteCursorEvent(Map<String, Object> obj) { if (!remoteEnabled) { return; @@ -475,7 +475,7 @@ public class Core implements IPendingSer log.trace("" + o); } @SuppressWarnings("unchecked") - Map<String, Object> returnMap = (o != null && o instanceof Map) ? (Map<String, Object>) o : new HashMap<String, Object>(); + Map<String, Object> returnMap = (o != null && o instanceof Map) ? (Map<String, Object>) o : new HashMap<>(); log.trace("call ### get Method Name " + method); if ("connect".equals(method)) { Object code = returnMap.get("code"); @@ -520,9 +520,9 @@ public class Core implements IPendingSer } log.debug("createPublishStream result stream id: {}; name: {}", getCapture().getStreamId(), publishName); instance.publish(getCapture().getStreamId(), publishName, "live", this); - + log.debug("setup capture thread spinnerWidth = {}; spinnerHeight = {};", spinnerWidth, spinnerHeight); - + if (!getCapture().isAlive()) { getCapture().setSendCursor(startSharing); getCapture().start(); @@ -566,7 +566,7 @@ public class Core implements IPendingSer public void setRemoteEnabled(boolean remoteEnabled) { this.remoteEnabled = remoteEnabled; } - + public void setDeadlockGuard(RTMPConnection conn) { ThreadPoolTaskScheduler deadlockGuard = new ThreadPoolTaskScheduler(); deadlockGuard.setPoolSize(16); Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java Wed Mar 1 06:11:13 2017 @@ -63,7 +63,7 @@ import org.slf4j.Logger; public class ScreenSharerFrame extends JFrame { private static final long serialVersionUID = 1L; private static final Logger logger = getLogger(ScreenSharerFrame.class); - + private JPanel contentPane; private JPanel panelScreen = new DisabledPanel(); private JPanel panelRecording = new DisabledPanel(); @@ -113,7 +113,7 @@ public class ScreenSharerFrame extends J private String recordingTipLabel; private String publishingTipLabel; private JCheckBox audioNotify; - + private class PublishTextField extends JTextField { private static final long serialVersionUID = 1L; @@ -139,23 +139,23 @@ public class ScreenSharerFrame extends J setColumns(10); } } - + private static class KeyValue<T> { private String key; private T value; - + public KeyValue(String key, T value) { this.key = key; this.value = value; } - + @SuppressWarnings("unused") public String getKey() { return key; } public T getValue() { return value; } - + @Override public String toString() { return key; } - + @Override public boolean equals(Object obj) { if (obj instanceof KeyValue) { @@ -165,7 +165,7 @@ public class ScreenSharerFrame extends J } return false; } - + @Override public int hashCode() { int hash = 7; @@ -173,7 +173,7 @@ public class ScreenSharerFrame extends J return hash; } } - + //this implementation will not allow to Enable Panel in runtime private static class DisabledPanel extends JPanel { private static final long serialVersionUID = 1L; @@ -186,7 +186,7 @@ public class ScreenSharerFrame extends J super.setEnabled(enabled); } } - + private static class VerticalSlider extends MouseListenerable { private static final long serialVersionUID = 1L; @@ -202,7 +202,7 @@ public class ScreenSharerFrame extends J add(jDown); } } - + private static class HorizontalSlider extends MouseListenerable { private static final long serialVersionUID = 1L; @@ -218,15 +218,15 @@ public class ScreenSharerFrame extends J add(jRight); } } - + private static String getTextLabel(String[] textLabels, int idx) { return textLabels != null && idx < textLabels.length ? textLabels[idx] : "#STAB#"; } - + /** * Create the frame. - * @throws AWTException - * @throws IOException + * @throws AWTException + * @throws IOException */ public ScreenSharerFrame(final Core core, String[] textLabels) throws AWTException { setTitle(getTextLabel(textLabels, 0)); //#id 730 @@ -246,9 +246,9 @@ public class ScreenSharerFrame extends J contentPane.setBackground(Color.WHITE); contentPane.setBorder(new EmptyBorder(5, 0, 5, 5)); setContentPane(contentPane); - + JLabel lblStartSharing = new JLabel(getTextLabel(textLabels, 1)); //#id 731 - + startSharingLabel = getTextLabel(textLabels, 2); //#id 732 stopSharingLabel = getTextLabel(textLabels, 3); //#id 733 startRecordingLabel = getTextLabel(textLabels, 15); //#id 871 @@ -287,7 +287,7 @@ public class ScreenSharerFrame extends J } } }); - + JLabel lblSelectArea = new JLabel(getTextLabel(textLabels, 4)); //#id 734 JPanel panelStatus = new JPanel(); audioNotify = new JCheckBox(getTextLabel(textLabels, 36)); //#id 1589 @@ -299,7 +299,7 @@ public class ScreenSharerFrame extends J core.setAudioNotify(audioNotify.isSelected()); } }); - + GroupLayout gl_contentPane = new GroupLayout(contentPane); gl_contentPane.setHorizontalGroup( gl_contentPane.createParallelGroup(Alignment.LEADING) @@ -349,10 +349,10 @@ public class ScreenSharerFrame extends J ); panelScreen.setLayout(null); panelScreen.setBackground(Color.WHITE); - + int width = ScreenDimensions.width; int height = ScreenDimensions.height; - + //Sliders upSlider.addListener(new ScreenYMouseListener(this)); upSlider.setToolTipText(getTextLabel(textLabels, 6)); //#id 737 @@ -360,14 +360,14 @@ public class ScreenSharerFrame extends J downSlider.addListener(new ScreenHeightMouseListener(this)); downSlider.setToolTipText(getTextLabel(textLabels, 6)); //#id 737 panelScreen.add(downSlider); - + leftSlider.addListener(new ScreenXMouseListener(this)); leftSlider.setToolTipText(getTextLabel(textLabels, 5)); //#id 735 panelScreen.add(leftSlider); rightSlider.addListener(new ScreenWidthMouseListener(this)); rightSlider.setToolTipText(getTextLabel(textLabels, 5)); //#id 735 panelScreen.add(rightSlider); - + //Virtual Screen virtualScreen.addListener(new ScreenMouseListener(this)); virtualScreen.setBounds(vScreenX, vScreenY, width, height); @@ -379,7 +379,7 @@ public class ScreenSharerFrame extends J JLabel bgScreen = new JLabel(imgBgScreen); bgScreen.setBounds(vScreenX, vScreenY, width, height); panelScreen.add(bgScreen); - + //Spinner Width JLabel vscreenWidthLabel = new JLabel(); vscreenWidthLabel.setText(getTextLabel(textLabels, 9)); //#id 740 @@ -443,43 +443,43 @@ public class ScreenSharerFrame extends J } }); panelScreen.add(spinnerY); - + //Quality JLabel labelQuality = new JLabel(); labelQuality.setText(getTextLabel(textLabels, 18)); //#id 1089 labelQuality.setBounds(250, 140, 200, 24); panelScreen.add(labelQuality); - - comboQuality = new JComboBox<KeyValue<ScreenQuality>>(); - comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 19), ScreenQuality.VeryHigh)); //#id 1090 - comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 20), ScreenQuality.High)); //#id 1091 - comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 21), ScreenQuality.Medium)); //#id 1092 - comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 22), ScreenQuality.Low)); //#id 1093 + + comboQuality = new JComboBox<>(); + comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 19), ScreenQuality.VeryHigh)); //#id 1090 + comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 20), ScreenQuality.High)); //#id 1091 + comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 21), ScreenQuality.Medium)); //#id 1092 + comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 22), ScreenQuality.Low)); //#id 1093 comboQuality.setBounds(250, 170, 130, 24); comboQuality.addActionListener(new ActionListener() { @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { - ScreenDimensions.quality = ((KeyValue<ScreenQuality>)comboQuality.getSelectedItem()).getValue(); - calcRescaleFactors(); + ScreenDimensions.quality = ((KeyValue<ScreenQuality>)comboQuality.getSelectedItem()).getValue(); + calcRescaleFactors(); } - }); + }); comboQuality.setSelectedIndex(core.defaultQuality); panelScreen.add(comboQuality); - comboFPS = new JComboBox<KeyValue<Integer>>(); - comboFPS.addItem(new KeyValue<Integer>("2 FPS", 2)); - comboFPS.addItem(new KeyValue<Integer>("5 FPS", 5)); - comboFPS.addItem(new KeyValue<Integer>("10 FPS", 10)); - comboFPS.addItem(new KeyValue<Integer>("15 FPS", 15)); - comboFPS.addItem(new KeyValue<Integer>("20 FPS", 20)); - comboFPS.addItem(new KeyValue<Integer>("25 FPS", 25)); - comboFPS.addItem(new KeyValue<Integer>("30 FPS", 30)); + comboFPS = new JComboBox<>(); + comboFPS.addItem(new KeyValue<>("2 FPS", 2)); + comboFPS.addItem(new KeyValue<>("5 FPS", 5)); + comboFPS.addItem(new KeyValue<>("10 FPS", 10)); + comboFPS.addItem(new KeyValue<>("15 FPS", 15)); + comboFPS.addItem(new KeyValue<>("20 FPS", 20)); + comboFPS.addItem(new KeyValue<>("25 FPS", 25)); + comboFPS.addItem(new KeyValue<>("30 FPS", 30)); comboFPS.addActionListener(new ActionListener() { @Override @SuppressWarnings("unchecked") public void actionPerformed(ActionEvent e) { - ScreenDimensions.FPS = ((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue(); - calcRescaleFactors(); + ScreenDimensions.FPS = ((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue(); + calcRescaleFactors(); } }); boolean fpsSelected = false; @@ -492,24 +492,24 @@ public class ScreenSharerFrame extends J } } if (!fpsSelected) { - comboFPS.addItem(new KeyValue<Integer>(core.defaultFPS + " FPS", core.defaultFPS)); + comboFPS.addItem(new KeyValue<>(core.defaultFPS + " FPS", core.defaultFPS)); comboFPS.setSelectedIndex(comboFPS.getItemCount() - 1); } comboFPS.setBounds(390, 170, 70, 24); comboFPS.setVisible(core.showFPS); panelScreen.add(comboFPS); - + panelRecording.setBackground(Color.WHITE); tabbedPane.addTab(getTextLabel(textLabels, 13), null, panelRecording, null); //#id 869 tabbedPane.setEnabledAt(0, true); panelRecording.setLayout(null); panelRecording.setEnabled(false); - + JLabel lblRecordingDesc = new JLabel("<html>" + getTextLabel(textLabels, 14) + "</html>"); //#id 870 lblRecordingDesc.setVerticalAlignment(SwingConstants.TOP); lblRecordingDesc.setBounds(10, 10, 447, 60); panelRecording.add(lblRecordingDesc); - + btnStartStopRecording = new JButton(getTextLabel(textLabels, 15)); //#id 871 btnStartStopRecording.setToolTipText(getTextLabel(textLabels, 15)); //#id 871 btnStartStopRecording.setIcon(startIcon); @@ -535,49 +535,49 @@ public class ScreenSharerFrame extends J } }); panelRecording.add(btnStartStopRecording); - + panelPublish.setBackground(Color.WHITE); tabbedPane.addTab(getTextLabel(textLabels, 23), null, panelPublish, null); //#id 1465 tabbedPane.setEnabledAt(1, true); panelPublish.setEnabled(false); panelPublish.setLayout(null); - + JLabel lblPublishDesc = new JLabel(getTextLabel(textLabels, 33)); //#id 1475 lblPublishDesc.setVerticalAlignment(SwingConstants.TOP); lblPublishDesc.setBounds(10, 5, 450, 20); panelPublish.add(lblPublishDesc); - + JLabel lblPublishHost = new JLabel(getTextLabel(textLabels, 26)); //#id 1468 lblPublishHost.setVerticalAlignment(SwingConstants.TOP); lblPublishHost.setBounds(10, 27, 140, 20); panelPublish.add(lblPublishHost); - + JLabel lblPublishApp = new JLabel(getTextLabel(textLabels, 27)); //#id 1469 lblPublishApp.setVerticalAlignment(SwingConstants.TOP); lblPublishApp.setBounds(160, 27, 140, 20); panelPublish.add(lblPublishApp); - + JLabel lblPublishId = new JLabel(getTextLabel(textLabels, 28)); //#id 1470 lblPublishId.setVerticalAlignment(SwingConstants.TOP); lblPublishId.setBounds(310, 27, 140, 20); panelPublish.add(lblPublishId); - + textPublishHost = new PublishTextField(); textPublishHost.setBounds(10, 45, 140, 20); panelPublish.add(textPublishHost); - + textPublishApp = new PublishTextField(); textPublishApp.setBounds(160, 45, 140, 20); panelPublish.add(textPublishApp); - + textPublishId = new PublishTextField(); textPublishId.setBounds(310, 45, 140, 20); panelPublish.add(textPublishId); - + lblPublishURL = new JLabel(""); lblPublishURL.setBounds(10, 69, 447, 14); panelPublish.add(lblPublishURL); - + btnStartStopPublish = new JButton(getTextLabel(textLabels, 24)); //#id 1466 btnStartStopPublish.setToolTipText(getTextLabel(textLabels, 24)); //#id 1466 btnStartStopPublish.setIcon(startIcon); @@ -603,12 +603,12 @@ public class ScreenSharerFrame extends J } }); panelPublish.add(btnStartStopPublish); - + JPanel panelSecurity = new JPanel(); panelSecurity.setLayout(null); panelSecurity.setBackground(Color.WHITE); tabbedPane.addTab(getTextLabel(textLabels, 37), null, panelSecurity, null); //#id 1598 - + final JCheckBox remoteEnabled = new JCheckBox(getTextLabel(textLabels, 38)); //#id 1078 remoteEnabled.setBackground(Color.WHITE); remoteEnabled.setSelected(core.isRemoteEnabled()); @@ -621,7 +621,7 @@ public class ScreenSharerFrame extends J } }); panelSecurity.add(remoteEnabled); - + panelStatus.setBackground(SystemColor.control); panelStatus.setLayout(null); lblStatus.setHorizontalAlignment(SwingConstants.LEFT); @@ -630,9 +630,9 @@ public class ScreenSharerFrame extends J BorderFactory.createLineBorder(Color.LIGHT_GRAY), BorderFactory.createEmptyBorder(0, 5, 0, 0))); panelStatus.add(lblStatus); - + contentPane.setLayout(gl_contentPane); - + // Background Image //We have no logo, that is why we need no background, sebawagner 29.04.2012 } @@ -648,7 +648,7 @@ public class ScreenSharerFrame extends J btnStartStopSharing.setText(status ? stopSharingLabel : startSharingLabel); btnStartStopSharing.setToolTipText(status ? stopSharingLabel : startSharingLabel); } - + public void setRecordingStatus(boolean status, boolean unlockScreen) { panelScreen.setEnabled(unlockScreen); if (status != recordingStarted) { @@ -660,7 +660,7 @@ public class ScreenSharerFrame extends J btnStartStopRecording.setText(status ? stopRecordingLabel : startRecordingLabel); btnStartStopRecording.setToolTipText(status ? stopRecordingLabel : startRecordingLabel); } - + public void setPublishingStatus(boolean status, boolean unlockScreen) { panelScreen.setEnabled(unlockScreen); if (status != publishStarted) { @@ -671,44 +671,44 @@ public class ScreenSharerFrame extends J btnStartStopPublish.setText(status ? stopPublishLabel : startPublishLabel); btnStartStopPublish.setToolTipText(status ? stopPublishLabel : startPublishLabel); } - + public void setRecordingTabEnabled(boolean enabled) { panelRecording.setEnabled(enabled); tabbedPane.setEnabledAt(0, enabled); tabbedPane.setToolTipTextAt(0, enabled ? null : recordingTipLabel); } - + public void setPublishingTabEnabled(boolean enabled) { panelPublish.setEnabled(enabled); tabbedPane.setEnabledAt(1, enabled); tabbedPane.setToolTipTextAt(1, enabled ? null : publishingTipLabel); } - + public String getPublishHost() { return textPublishHost.getText(); } - + public String getPublishApp() { return textPublishApp.getText(); } - + public String getPublishId() { return textPublishId.getText(); } - + private void updatePublishURL() { lblPublishURL.setText("rtmp://" + textPublishHost.getText() + ":1935/" + textPublishApp.getText() + "/" + textPublishId.getText()); } - + public void setShowWarning(boolean showWarning) { this.showWarning = showWarning; } - + public void setDoUpdateBounds(boolean doUpdateBounds) { this.doUpdateBounds = doUpdateBounds; } - + public void setStatus(String status) { lblStatus.setText(status); } @@ -846,11 +846,11 @@ public class ScreenSharerFrame extends J rightSlider.setBounds(x + vScreenX + width - 16, y + vScreenY - 8 + (height / 2), 32, 16); upSlider.setBounds(x + vScreenX + (width / 2) - 8, y + vScreenY - 16, 16, 32); downSlider.setBounds(x + vScreenX + (width / 2) - 8, y + vScreenY - 16 + height, 16, 32); - + virtualScreen.setText(ScreenDimensions.spinnerWidth + ":" + ScreenDimensions.spinnerHeight); virtualScreen.setBounds(x + vScreenX, y + vScreenY, width, height); } - + /** * update the bounds of the vScreen * by using the vars from the Spinners Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java Wed Mar 1 06:11:13 2017 @@ -57,7 +57,7 @@ public class RemoteJob implements Job { private static final Logger log = getLogger(RemoteJob.class); public static final String CORE_KEY = "core"; private Robot robot = null; - + public RemoteJob() { try { robot = new Robot(); @@ -73,7 +73,7 @@ public class RemoteJob implements Job { Core core = (Core)data.get(CORE_KEY); try { Map<String, Object> obj = null; - while ((obj = core.getRemoteEvents().poll(1, TimeUnit.MILLISECONDS)) != null) { + while ((obj = core.getRemoteEvents().poll(1, TimeUnit.MILLISECONDS)) != null) { String action = "" + obj.get("action"); log.trace("Action polled:: {}, count: {}", action, core.getRemoteEvents().size()); @@ -96,7 +96,7 @@ public class RemoteJob implements Job { } else if (action.equals("copy")) { String paste = getHighlightedText(); - Map<Integer, String> map = new HashMap<Integer, String>(); + Map<Integer, String> map = new HashMap<>(); map.put(0, "copiedText"); map.put(1, paste); @@ -106,7 +106,7 @@ public class RemoteJob implements Job { } else if (action.equals("show")) { String paste = getClipboardText(); - Map<Integer, String> map = new HashMap<Integer, String>(); + Map<Integer, String> map = new HashMap<>(); map.put(0, "copiedText"); map.put(1, paste); Modified: openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java Wed Mar 1 06:11:13 2017 @@ -18,9 +18,17 @@ */ package org.apache.openmeetings.service.calendar.caldav.handler; -import net.fortuna.ical4j.data.CalendarOutputter; -import net.fortuna.ical4j.model.Calendar; -import net.fortuna.ical4j.model.Component; +import static javax.servlet.http.HttpServletResponse.SC_CREATED; +import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; +import static javax.servlet.http.HttpServletResponse.SC_OK; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpClient; @@ -46,17 +54,9 @@ import org.osaf.caldav4j.util.UrlUtils; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; -import static org.apache.jackrabbit.webdav.DavServletResponse.SC_OK; -import static org.apache.jackrabbit.webdav.DavServletResponse.SC_CREATED; -import static org.apache.jackrabbit.webdav.DavServletResponse.SC_NO_CONTENT; -import static org.apache.jackrabbit.webdav.DavServletResponse.SC_NOT_FOUND; +import net.fortuna.ical4j.data.CalendarOutputter; +import net.fortuna.ical4j.model.Calendar; +import net.fortuna.ical4j.model.Component; /** * Class which handles the Syncing through the use of Etags. @@ -86,7 +86,7 @@ public class EtagsHandler extends Abstra CompFilter vcalendar = new CompFilter(Calendar.VCALENDAR); vcalendar.addCompFilter(new CompFilter(Component.VEVENT)); - + CalDAVReportMethod reportMethod = null; try { CalendarQuery query = new CalendarQuery(properties, vcalendar, map.isEmpty() ? new CalendarData() : null, false, false); @@ -96,7 +96,7 @@ public class EtagsHandler extends Abstra MultiStatusResponse[] multiStatusResponses = reportMethod.getResponseBodyAsMultiStatus().getResponses(); if (map.isEmpty()) { //Initializing the Calendar for the first time. - + //Parse the responses into Appointments for (MultiStatusResponse response : multiStatusResponses) { if (response.getStatus()[0].getStatusCode() == SC_OK) { @@ -104,13 +104,13 @@ public class EtagsHandler extends Abstra Calendar ical = CalendarDataProperty.getCalendarfromResponse(response); Appointment appointments = utils.parseCalendartoAppointment( ical, response.getHref(), etag, calendar); - + appointmentDao.update(appointments, ownerId); } } } else { //Calendar has been inited before - List<String> currenthrefs = new ArrayList<String>(); + List<String> currenthrefs = new ArrayList<>(); for (MultiStatusResponse response : multiStatusResponses) { if (response.getStatus()[0].getStatusCode() == SC_OK) { Modified: openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Wed Mar 1 06:11:13 2017 @@ -21,11 +21,12 @@ package org.apache.openmeetings.service. import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import java.util.Map; import java.util.TimeZone; import java.util.UUID; -import java.util.Vector; import org.apache.openmeetings.IApplication; import org.apache.openmeetings.core.mail.MailHandler; @@ -56,9 +57,9 @@ import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; /** - * + * * @author swagner - * + * */ public class InvitationManager implements IInvitationManager { private static final Logger log = Red5LoggerFactory.getLogger(InvitationManager.class, webAppRootKey); @@ -74,12 +75,12 @@ public class InvitationManager implement /** * @author vasya - * + * * @param mm * @param a * @param message * @param subject - * @throws Exception + * @throws Exception */ private void sendInvitionLink(Appointment a, MeetingMember mm, MessageType type, boolean ical) throws Exception { User owner = a.getOwner(); @@ -97,11 +98,10 @@ public class InvitationManager implement default: t = UpdatedAppointmentTemplate.get(mm.getUser(), a, tz, invitorName); break; - } sendInvitationLink(mm.getInvitation(), type, t.getSubject(), t.getEmail(), ical); } - + @Override public void sendInvitationLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception { String invitation_link = null; @@ -110,12 +110,12 @@ public class InvitationManager implement invitation_link = app.getOmInvitationLink(i); } User owner = i.getInvitedBy(); - + String invitorName = owner.getFirstname() + " " + owner.getLastname(); String template = InvitationTemplate.getEmail(i.getInvitee(), invitorName, message, invitation_link); String email = i.getInvitee().getAddress().getEmail(); String replyToEmail = owner.getAddress().getEmail(); - + if (ical) { String username = i.getInvitee().getLogin(); boolean isOwner = owner.getId().equals(i.getInvitee().getId()); @@ -123,7 +123,7 @@ public class InvitationManager implement Map<String, String> attendeeList = handler.getAttendeeData(email, username, isOwner); - Vector<Map<String, String>> atts = new Vector<Map<String, String>>(); + List<Map<String, String>> atts = new ArrayList<>(); atts.add(attendeeList); // Defining Organizer @@ -152,7 +152,7 @@ public class InvitationManager implement /** * This method sends invitation reminder SMS * @param phone user's phone - * @param subject + * @param subject * @return */ @Override @@ -169,7 +169,7 @@ public class InvitationManager implement } /** - * + * * @param hashCode * @param hidePass * @return @@ -209,7 +209,7 @@ public class InvitationManager implement } /** - * + * * @param hashCode * @param pass * @return @@ -235,10 +235,10 @@ public class InvitationManager implement } return new Long(-1); } - + /** * @author vasya - * + * * @param member * @param a */ @@ -278,7 +278,7 @@ public class InvitationManager implement , boolean isPasswordProtected, String invitationpass, Valid valid, User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd , Appointment appointment) { - + Invitation invitation = _invitation; if (null == _invitation) { invitation = new Invitation(); @@ -292,7 +292,7 @@ public class InvitationManager implement invitation.setUsed(false); invitation.setValid(valid); - + // valid period of Invitation switch (valid) { case Period: Modified: openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Wed Mar 1 06:11:13 2017 @@ -103,7 +103,7 @@ public class UserManager implements IUse public SearchResult<User> getAllUserByRange(String search, int start, int max, String orderby, boolean asc) { try { - SearchResult<User> sresult = new SearchResult<User>(); + SearchResult<User> sresult = new SearchResult<>(); sresult.setObjectName(User.class.getName()); sresult.setRecords(userDao.count(search)); @@ -431,7 +431,7 @@ public class UserManager implements IUse IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName); scopeApplicationAdapter.roomLeaveByScope(rcl, currentScope, true); - HashMap<Integer, String> messageObj = new HashMap<Integer, String>(); + Map<Integer, String> messageObj = new HashMap<>(); messageObj.put(0, "kick"); scopeApplicationAdapter.sendMessageById(messageObj, rcl.getStreamid(), currentScope); } @@ -461,7 +461,7 @@ public class UserManager implements IUse } IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName); - HashMap<Integer, String> messageObj = new HashMap<Integer, String>(); + Map<Integer, String> messageObj = new HashMap<>(); messageObj.put(0, "kick"); scopeApplicationAdapter.sendMessageById(messageObj, rcl.getStreamid(), currentScope); Modified: openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java Wed Mar 1 06:11:13 2017 @@ -22,21 +22,21 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * + * * Get some of the default values for the upload - * + * * @author solomax, swagner - * + * */ public class ImportHelper { /** * returns a list of all timezones as a {@link Map} - * + * * @param tzList * @return */ public static Map<String, String> getAllTimeZones(String ... tzList) { - Map<String, String> result = new LinkedHashMap<String, String>(); + Map<String, String> result = new LinkedHashMap<>(); for (String omTimeZone : tzList) { result.put(omTimeZone, omTimeZone); Modified: openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java Wed Mar 1 06:11:13 2017 @@ -25,9 +25,9 @@ import java.io.FileOutputStream; import java.net.URI; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.Vector; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -54,9 +54,9 @@ import net.fortuna.ical4j.model.property import net.fortuna.ical4j.model.property.Version; /** - * + * * @author o.becherer, seba.wagner - * + * */ public class IcalHandler { private static final Logger log = Red5LoggerFactory.getLogger(IcalHandler.class, webAppRootKey); @@ -74,14 +74,14 @@ public class IcalHandler { /** * Constructor - * + * * @param method * (@see IcalHandler Constants) * @throws Exception */ public IcalHandler(Method method) { log.debug("Icalhandler method type : " + method); - + icsCalendar = new Calendar(); icsCalendar.getProperties().add(new ProdId("-//Events Calendar//iCal4j 1.0//EN")); icsCalendar.getProperties().add(Version.VERSION_2_0); @@ -90,7 +90,7 @@ public class IcalHandler { } /** - * + * * @param startDate * use standard TimeZone!! * @param endDate @@ -110,12 +110,12 @@ public class IcalHandler { */ // --------------------------------------------------------------------------------------- public String addNewMeeting(Date startDate, Date endDate, String name, - Vector<Map<String, String>> attendees, String description, + List<Map<String, String>> attendees, String description, Map<String, String> organizer, String uid, String javaTzId) throws Exception { TimeZoneRegistry registry = TimeZoneRegistryFactory.getInstance().createRegistry(); - + TimeZone timeZone = registry.getTimeZone(javaTzId); if (timeZone == null) { throw new Exception("Unable to get time zone by id provided: " + javaTzId); @@ -125,7 +125,7 @@ public class IcalHandler { start.setTimeZone(timeZone); DateTime end = new DateTime(endDate); end.setTimeZone(timeZone); - + VEvent meeting = new VEvent(start, end, name); meeting.getProperties().add(new Description(description)); @@ -169,7 +169,7 @@ public class IcalHandler { * addMeetings Generate a Attendee */ public Map<String, String> getAttendeeData(String emailAdress, String displayName, boolean chair) { - Map<String, String> oneRecord = new HashMap<String, String>(); + Map<String, String> oneRecord = new HashMap<>(); oneRecord.put("uri", "mailto:"; + emailAdress); oneRecord.put("cn", displayName); oneRecord.put("chair", chair ? "1" : "0"); Modified: openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java Wed Mar 1 06:11:13 2017 @@ -18,13 +18,12 @@ */ package org.apache.openmeetings.util.message; -import java.io.Serializable; import java.util.Date; import java.util.UUID; import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage; -public class RoomMessage implements IWebSocketPushMessage, Serializable { +public class RoomMessage implements IWebSocketPushMessage { private static final long serialVersionUID = 1L; public enum Type { roomEnter Modified: openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java Wed Mar 1 06:11:13 2017 @@ -39,11 +39,11 @@ public class ProcessHelper { private static class Worker extends Thread { private final Process process; private Integer exitCode; - + private Worker(Process process) { this.process = process; } - + @Override public void run() { try { @@ -58,13 +58,13 @@ public class ProcessHelper { public StringBuilder output; private final InputStream is; private final BufferedReader br; - + private StreamWatcher(Process process, boolean isError) throws UnsupportedEncodingException { output = new StringBuilder(); is = isError ? process.getErrorStream() : process.getInputStream(); br = new BufferedReader(new InputStreamReader(is, UTF_8)); } - + @Override public void run() { try { @@ -85,14 +85,14 @@ public class ProcessHelper { cmd[0] = "cmd.exe"; cmd[1] = "/C"; System.arraycopy(argv, 0, cmd, 2, argv.length); - Map<String, String> env = new HashMap<String, String>(); + Map<String, String> env = new HashMap<>(); return executeScript(process, cmd, env); } catch (Exception t) { log.error("executeScriptWindows", t); return new ConverterProcessResult(process, t.getMessage(), t); } } - + private static String getCommand(String[] argv) { StringBuffer tString = new StringBuffer(); for (int i = 0; i < argv.length; i++) { @@ -100,54 +100,54 @@ public class ProcessHelper { } return tString.toString(); } - + private static void debugCommandStart(String desc, String[] argv) { if (log.isDebugEnabled()) { log.debug("START " + desc + " ################# "); log.debug(getCommand(argv)); } } - + private static void debugCommandEnd(String desc) { if (log.isDebugEnabled()) { log.debug("END " + desc + " ################# "); } } - + public static ConverterProcessResult executeScript(String process, String[] argv) { - Map<String, String> env = new HashMap<String, String>(); + Map<String, String> env = new HashMap<>(); return executeScript(process, argv, env); } - + public static ConverterProcessResult executeScript(String process, String[] argv, Map<? extends String, ? extends String> env) { ConverterProcessResult returnMap = new ConverterProcessResult(); returnMap.setProcess(process); debugCommandStart(process, argv); - + try { returnMap.setCommand(getCommand(argv)); returnMap.setOut(""); - + // By using the process Builder we have access to modify the // environment variables // that is handy to set variables to run it inside eclipse ProcessBuilder pb = new ProcessBuilder(argv); pb.environment().putAll(env); - + Process proc = pb.start(); - + // 20-minute timeout for command execution // FFMPEG conversion of Recordings may take a real long time until // its finished long timeout = 60000 * 20; - + StreamWatcher errorWatcher = new StreamWatcher(proc, true); Worker worker = new Worker(proc); StreamWatcher inputWatcher = new StreamWatcher(proc, false); errorWatcher.start(); inputWatcher.start(); worker.start(); - + try { worker.join(timeout); if (worker.exitCode != null) { @@ -158,7 +158,7 @@ public class ProcessHelper { returnMap.setException("timeOut"); returnMap.setError(errorWatcher.output.toString()); returnMap.setExitCode(-1); - + throw new TimeoutException(); } } catch (InterruptedException ex) { @@ -166,22 +166,22 @@ public class ProcessHelper { errorWatcher.interrupt(); inputWatcher.interrupt(); Thread.currentThread().interrupt(); - + returnMap.setError(ex.getMessage()); returnMap.setExitCode(-1); - + throw ex; } finally { proc.destroy(); } - + } catch (Throwable t) { log.error("executeScript", t); returnMap.setError(t.getMessage()); returnMap.setException(t.toString()); returnMap.setExitCode(-1); } - + debugCommandEnd(process); return returnMap; } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java Wed Mar 1 06:11:13 2017 @@ -26,8 +26,8 @@ import java.util.List; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; -import org.wicketstuff.select2.Response; import org.wicketstuff.select2.ChoiceProvider; +import org.wicketstuff.select2.Response; public abstract class AdminUserChoiceProvider extends ChoiceProvider<User> { private static final long serialVersionUID = 1L; @@ -47,10 +47,10 @@ public abstract class AdminUserChoicePro @Override public Collection<User> toChoices(Collection<String> _ids) { - List<Long> ids = new ArrayList<Long>(); + List<Long> ids = new ArrayList<>(); for (String id : _ids) { ids.add(Long.valueOf(id)); } - return new ArrayList<User>(getBean(UserDao.class).get(ids)); + return new ArrayList<>(getBean(UserDao.class).get(ids)); } } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Wed Mar 1 06:11:13 2017 @@ -158,7 +158,7 @@ public class BackupPanel extends AdminPa } } }); - add((progressBar = new ProgressBar("dprogress", new Model<Integer>(0)) { + add((progressBar = new ProgressBar("dprogress", new Model<>(0)) { private static final long serialVersionUID = 1L; @Override Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Wed Mar 1 06:11:13 2017 @@ -44,9 +44,9 @@ import org.apache.wicket.validation.Vali /** * Handle {@link Configuration} items as list and form - * + * * @author swagner - * + * */ public class ConfigForm extends AdminBaseForm<Configuration> { private static final long serialVersionUID = 1L; @@ -56,9 +56,9 @@ public class ConfigForm extends AdminBas target.add(this); target.appendJavaScript("omConfigPanelInit();"); } - + public ConfigForm(String id, WebMarkupContainer listContainer, Configuration configuration) { - super(id, new CompoundPropertyModel<Configuration>(configuration)); + super(id, new CompoundPropertyModel<>(configuration)); setOutputMarkupId(true); this.listContainer = listContainer; add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){ @@ -76,12 +76,12 @@ public class ConfigForm extends AdminBas add(forDatePattern("updated", WEB_DATE_PATTERN)); add(new Label("user.login")); add(new TextArea<String>("comment")); - + // attach an ajax validation behavior to all form component's keydown // event and throttle it down to once per second add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND)); } - + @Override protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) { ConfigurationDao cfgDao = getBean(ConfigurationDao.class); @@ -100,7 +100,7 @@ public class ConfigForm extends AdminBas this.setModelObject(new Configuration()); refresh(target); } - + @Override protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) { Configuration conf = getModelObject(); @@ -112,7 +112,7 @@ public class ConfigForm extends AdminBas setModelObject(conf); refresh(target); } - + @Override protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) { getBean(ConfigurationDao.class).delete(getModelObject(), WebSession.getUserId()); Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Wed Mar 1 06:11:13 2017 @@ -37,15 +37,15 @@ import org.apache.wicket.markup.repeater /** * add/update/delete {@link Configuration} - * + * * @author swagner - * + * */ public class ConfigsPanel extends AdminPanel { private static final long serialVersionUID = 1L; private ConfigForm form; private final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); - + @Override public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) { super.onMenuPanelLoad(handler); @@ -55,9 +55,9 @@ public class ConfigsPanel extends AdminP public ConfigsPanel(String id) { super(id); - + SearchableDataView<Configuration> dataView = new SearchableDataView<Configuration>("configList" - , new SearchableDataProvider<Configuration>(ConfigurationDao.class)) { + , new SearchableDataProvider<>(ConfigurationDao.class)) { private static final long serialVersionUID = 1L; @Override @@ -89,16 +89,16 @@ public class ConfigsPanel extends AdminP target.add(listContainer); } }; - DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView, navigator); - container.addLink(new OmOrderByBorder<Configuration>("orderById", "id", container)) - .addLink(new OmOrderByBorder<Configuration>("orderByKey", "key", container)) - .addLink(new OmOrderByBorder<Configuration>("orderByValue", "value", container)); + DataViewContainer<Configuration> container = new DataViewContainer<>(listContainer, dataView, navigator); + container.addLink(new OmOrderByBorder<>("orderById", "id", container)) + .addLink(new OmOrderByBorder<>("orderByKey", "key", container)) + .addLink(new OmOrderByBorder<>("orderByValue", "value", container)); add(container.getLinks()); add(navigator); - + form = new ConfigForm("form", listContainer, new Configuration()); form.showNewRecord(); add(form); - + } } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Wed Mar 1 06:11:13 2017 @@ -59,7 +59,7 @@ public class ConnectionsPanel extends Ad @Override public Iterator<? extends Client> iterator(long first, long count) { //FIXME add grouping by public SID - List<Client> l = new ArrayList<Client>(getBean(ISessionManager.class).getClientsWithServer()); + List<Client> l = new ArrayList<>(getBean(ISessionManager.class).getClientsWithServer()); return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator(); } @@ -131,7 +131,7 @@ public class ConnectionsPanel extends Ad @Override public Iterator<? extends org.apache.openmeetings.db.entity.basic.Client> iterator(long first, long count) { - List<org.apache.openmeetings.db.entity.basic.Client> l = new ArrayList<org.apache.openmeetings.db.entity.basic.Client>(Application.getClients()); + List<org.apache.openmeetings.db.entity.basic.Client> l = new ArrayList<>(Application.getClients()); return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator(); } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java Wed Mar 1 06:11:13 2017 @@ -41,7 +41,7 @@ public class EmailPanel extends AdminPan public EmailPanel(String id) { super(id); SearchableDataView<MailMessage> dataView = new SearchableDataView<MailMessage>("email", - new SearchableDataProvider<MailMessage>(MailMessageDao.class)) + new SearchableDataProvider<>(MailMessageDao.class)) { private static final long serialVersionUID = 1L; @@ -73,17 +73,17 @@ public class EmailPanel extends AdminPan target.add(list); } }; - DataViewContainer<MailMessage> container = new DataViewContainer<MailMessage>(list, dataView, navigator); - container.addLink(new OmOrderByBorder<MailMessage>("orderById", "id", container)) - .addLink(new OmOrderByBorder<MailMessage>("orderBySubject", "subject", container)) - .addLink(new OmOrderByBorder<MailMessage>("orderByStatus", "status", container)); + DataViewContainer<MailMessage> container = new DataViewContainer<>(list, dataView, navigator); + container.addLink(new OmOrderByBorder<>("orderById", "id", container)) + .addLink(new OmOrderByBorder<>("orderBySubject", "subject", container)) + .addLink(new OmOrderByBorder<>("orderByStatus", "status", container)); add(container.getLinks()); add(navigator); - + form = new EmailForm("form", list, new MailMessage()); add(form); } - + private StringBuilder getRowClass(final MailMessage m) { StringBuilder sb = getRowClass(m.getId(), form.getModelObject().getId()); if (MailMessage.Status.ERROR == m.getStatus()) {
