1.1 --- a/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/commands/TeamwareCommitCommand.java Tue Jun 14 18:23:48 2005 +0000
1.2 +++ b/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/commands/TeamwareCommitCommand.java Tue Jun 14 19:44:49 2005 +0000
1.3 @@ -16,7 +16,9 @@
1.4
1.5 package org.netbeans.modules.vcs.profiles.teamware.commands;
1.6
1.7 +import java.io.BufferedReader;
1.8 import java.io.File;
1.9 +import java.io.FileReader;
1.10 import java.io.IOException;
1.11 import java.util.Hashtable;
1.12
1.13 @@ -35,7 +37,16 @@
1.14
1.15 File file = TeamwareSupport.getFile(vars);
1.16 try {
1.17 - new SFile(file).delget((String) vars.get("COMMENT"));
1.18 + StringBuffer sb = new StringBuffer();
1.19 + File commentFile = new File((String) vars.get("COMMENT"));
1.20 + BufferedReader r = new BufferedReader(new FileReader(commentFile));
1.21 + for (String line; (line = r.readLine()) != null;) {
1.22 + if (sb.length() > 0) {
1.23 + sb.append("\n");
1.24 + }
1.25 + sb.append(line);
1.26 + }
1.27 + new SFile(file).delget(sb.toString());
1.28 return true;
1.29 } catch (IOException e) {
1.30 stderr.outputLine(e.toString());
2.1 --- a/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/commands/TeamwareRefreshCommand.java Tue Jun 14 18:23:48 2005 +0000
2.2 +++ b/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/commands/TeamwareRefreshCommand.java Tue Jun 14 19:44:49 2005 +0000
2.3 @@ -40,7 +40,9 @@
2.4 for (int i = 0 ; i < files.length; i++) {
2.5 String[] data = TeamwareRefreshSupport.listFile(files[i],
2.6 sccsDir, stderrListener);
2.7 - if (data != null /*&& !data[0].equals("Ignored")*/) {
2.8 + if (data != null
2.9 + && !data[0].equals("Ignored")
2.10 + && !data[0].equals("Local")) {
2.11 stdoutListener.outputLine(dir + File.separator + data[1] + " [" + data[0] + "]");
2.12 filesByName.put(data[1], data);
2.13 }
3.1 --- a/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/config/teamware.xml Tue Jun 14 18:23:48 2005 +0000
3.2 +++ b/vcs.profiles.teamware/src/org/netbeans/modules/vcs/profiles/teamware/config/teamware.xml Tue Jun 14 19:44:49 2005 +0000
3.3 @@ -180,7 +180,7 @@
3.4 </command>
3.5 <command displayName="Commit" name="CHECKIN">
3.6 <property name="inputDescriptor">
3.7 - <value>PROMPT_FOR(COMMENT, "Comment:", "")</value>
3.8 + <value>PROMPT_FOR_FILE(COMMENT, "Comment:")</value>
3.9 </property>
3.10 <property name="exec">
3.11 <value>org.netbeans.modules.vcs.profiles.teamware.commands.TeamwareCommitCommand.class</value>