Author: vjrj_ Date: 2011-09-01 13:38:59 +0200 (Thu, 01 Sep 2011) New Revision: 1502 Modified: trunk/TODO trunk/pom.xml trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java trunk/src/main/java/cc/kune/domain/GroupList.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java Log: CLOSED - # 111: Rights problems in user space http://kune.ourproject.org/issues/ticket/111 Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/TODO 2011-09-01 11:38:59 UTC (rev 1502) @@ -376,19 +376,6 @@ http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/e8e14... Also autocomplete user/passwordi (for browser store): http://groups.google.fr/group/Google-Web-Toolkit/browse_thread/thread/2b2ce0... -** vjrj <v> kune debian package: - Study fat jar + deb package: - http://anydoby.com/fatjar/ - Currently we are testing this snapshot: - http://mojo.codehaus.org/deb-maven-plugin/ - with: mvn package -Dmaven.test.skip=true - generates a deb with big (and not very accute) dependencies: - dpkg -X trunk/org.ourproject-kune-0.0.5-0.deb - dpkg -I trunk/org.ourproject-kune-0.0.5-0.deb - Other possibility: - http://vafer.org/blog/20070918215154 - Related info: - http://java.debian.net/building.html *** steps **** create user kune **** create /var/lib/kune/uploads and give permissions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/pom.xml 2011-09-01 11:38:59 UTC (rev 1502) @@ -81,23 +81,14 @@ <id>dyndns-repo</id> <url>http://maven.dyndns.org/2</url> </repository> + <!-- seems that these are not working/neccesary now: --> + <!-- <repository> <id>google-maven-snapshot-repository</id> <name>Google + Maven Snapshot Repository</name> <url>https://oss.sonatype.org/content/repositories/google-snapshots/ + </url> <snapshots> <enabled>true</enabled> </snapshots> </repository> <repository> + <id>gwtplatform.snapshot.repo</id> <name>Gwtplatform snapshot repository</name> + <url>https://oss.sonatype.org/content/repositories/snapshots/ </url> <layout>default</layout> + </repository> --> <repository> - <id>google-maven-snapshot-repository</id> - <name>Google Maven Snapshot Repository</name> - <url>https://oss.sonatype.org/content/repositories/google-snapshots/ - </url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>gwtplatform.snapshot.repo</id> - <name>Gwtplatform snapshot repository</name> - <url>https://oss.sonatype.org/content/repositories/snapshots/ - </url> - <layout>default</layout> - </repository> - <repository> <id>openqa.org</id> <name>Openqa Release Repository</name> <url>http://archiva.openqa.org/repository/releases</url> @@ -795,7 +786,7 @@ <systemProperty> <key>kune.server.config</key> <value>src/main/resources/kune.properties</value> - <!-- <value>kune.properties</value> --> + <!-- <value>kune.properties</value> --> </systemProperty> <systemProperty> <key>wave.server.config</key> Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -121,12 +121,7 @@ public int hashCode() { final int prime = 31; int result = 1; - // result = prime * result + (defaultLicense == null ? 0 : - // defaultLicense.hashCode()); - // result = prime * result + (id == null ? 0 : id.hashCode()); - // result = prime * result + (longName == null ? 0 : longName.hashCode()); result = prime * result + (shortName == null ? 0 : shortName.hashCode()); - // result = prime * result + (groupType == null ? 0 : groupType.hashCode()); return result; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -38,17 +38,6 @@ this.list = list; } - public boolean checkIfIncludes(final GroupDTO group, final String mode) { - if (mode.equals(NOBODY)) { - return false; - } - if (mode.equals(EVERYONE)) { - return true; - } - boolean contains = list.contains(group); - return contains; - } - public Set<GroupDTO> getList() { return list; } @@ -58,7 +47,15 @@ } public boolean includes(final GroupDTO group) { - return checkIfIncludes(group, mode); + // Duplicate code in GroupList + if (mode.equals(NOBODY)) { + return false; + } + if (mode.equals(EVERYONE)) { + return true; + } + final boolean contains = list.contains(group); + return contains; } public void setList(final Set<GroupDTO> list) { Modified: trunk/src/main/java/cc/kune/domain/GroupList.java =================================================================== --- trunk/src/main/java/cc/kune/domain/GroupList.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/domain/GroupList.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -75,20 +75,6 @@ } } - public boolean checkIfIncludes(final Group group, final Set<Group> list, final GroupListMode mode) { - switch (mode) { - case NOBODY: - return false; - case EVERYONE: - return true; - default: - // Workaround for: - // http://www.timo-ernst.net/2011/06/remove-and-contains-not-working-on-your-ja... - return new HashSet<Group>(list).contains(group); - // return list.contains(group); - } - } - public void clear() { list.clear(); } @@ -110,7 +96,18 @@ } public boolean includes(final Group group) { - return checkIfIncludes(group, this.list, mode); + // Duplicate code in GroupListDTO + switch (mode) { + case NOBODY: + return false; + case EVERYONE: + return true; + default: + // Workaround for: + // http://www.timo-ernst.net/2011/06/remove-and-contains-not-working-on-your-ja... + return new HashSet<Group>(list).contains(group); + // return list.contains(group); + } } public boolean isEmpty() { Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-09-01 03:36:23 UTC (rev 1501) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-09-01 11:38:59 UTC (rev 1502) @@ -52,7 +52,7 @@ final boolean closeable, final CloseCallback closeCallback) { final UserMessage msg = new UserMessage(level, title, message, id, closeable, closeCallback); panel.add(msg); - if (panel.getWidgetCount() == 2) { + if (panel.getWidgetCount() == 1) { bottom.setVisible(true); } msg.addAttachHandler(new Handler() {