Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2011-08-31 15:55:57 -0400
committerJeff Johnston2011-08-31 15:55:57 -0400
commit69768934373be362c47ac77435ab8e4c8ef6b5b6 (patch)
treeb24c7c3de1d45eac3c6c64bbd1ee3c409ca4a1f3 /changelog
parentb976523cbb21e6b64b4c3ab25dcc0d28b411741c (diff)
downloadorg.eclipse.linuxtools-69768934373be362c47ac77435ab8e4c8ef6b5b6.tar.gz
org.eclipse.linuxtools-69768934373be362c47ac77435ab8e4c8ef6b5b6.tar.xz
org.eclipse.linuxtools-69768934373be362c47ac77435ab8e4c8ef6b5b6.zip
2011-08-31 Jeff Johnston <jjohnstn@redhat.com>
Bug #347703 * src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (outputMultipleEntryChangeLog): Ask for ChangeLog location at least once if one does not exist.
Diffstat (limited to 'changelog')
-rw-r--r--changelog/org.eclipse.linuxtools.changelog.core/ChangeLog6
-rw-r--r--changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java19
2 files changed, 19 insertions, 6 deletions
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog b/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
index 401ea5835d..a9d4e510b0 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
+++ b/changelog/org.eclipse.linuxtools.changelog.core/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-31 Jeff Johnston <jjohnstn@redhat.com>
+
+ Bug #347703
+ * src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (outputMultipleEntryChangeLog): Ask
+ for ChangeLog location at least once if one does not exist.
+
2011-08-26 Jeff Johnston <jjohnstn@redhat.com>
* src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java (extractSynchronizeModelInfo):
diff --git a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
index 0803e48247..5486b0b004 100644
--- a/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
+++ b/changelog/org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/actions/PrepareChangeLogAction.java
@@ -87,6 +87,7 @@ public class PrepareChangeLogAction extends ChangeLogAction {
protected boolean changeLogModified = false;
protected boolean newEntryWritten = false;
+ protected boolean createChangeLog = true;
private class MyDocumentProvider extends FileDocumentProvider {
@@ -456,13 +457,19 @@ public class PrepareChangeLogAction extends ChangeLogAction {
else
changelog = getChangelog(entryFileName);
- // If there isn't a ChangeLog, we will not create one here.
- // This prevents the situation whereby a project has an inline
- // ChangeLog formatter and some other files have been modified
- // as well (e.g. an rpm project). In that case, we don't want
- // to create a separate ChangeLog for the end-user.
- if (changelog == null)
+ // If there isn't a ChangeLog, we will ask for one here.
+ // We originally avoided this to prevent a problem for rpm
+ // projects whereby the changelog is inlined in a single file
+ // and not presented externally. This has been changed in
+ // response to bug #347703. If the user cancels the ask
+ // dialog, then the prepare operation doesn't try to create
+ // one.
+ if (createChangeLog && changelog == null)
+ changelog = askChangeLogLocation(entryPath.toOSString());
+ if (changelog == null) {
+ createChangeLog = false;
return;
+ }
}
if ((changelog instanceof ChangeLogEditor) && (!this.newEntryWritten)) {
ChangeLogEditor editor = (ChangeLogEditor) changelog;

Back to the top