Merge lp:~jnsrch/bibcite/FormerCommitsUndone into lp:bibcite

[Jens Rauch]

Could not get the trunk to run properly and had some issues after merging. So I uncommited your changes and only pushed mine into this new branch.

[Prunus dulcis (prunus-dulcis)]

I had forgotten to add one new file - will have to remember to run
bzr add
after I create a new class, image or whatnot!

Can you test the latest revision, if it runs properly again? I will look
into the merging process now.

On 05/09/11 20:14, Jens Rauch wrote:
> The proposal to merge lp:~jnsrch/bibcite/FormerCommitsUndone into lp:bibcite has been updated.
>
> Description changed to:
>
> Could not get the trunk to run properly and had some issues after merging. So I uncommited your changes and only pushed mine into this new branch.
>
> For more details, see:
> https://code.launchpad.net/~jnsrch/bibcite/FormerCommitsUndone/+merge/74130

[Prunus dulcis (prunus-dulcis)]

Alright, I did a manual merge - my mistake for changing the JList variable names in my commit before.

Your suggested fix does not work for me (and why can I not attach pictures here).

jList2.setLayoutOrientation(javax.swing.JList.VERTICAL_WRAP);

leads for me to elements still being centered, but instead of just one column, the elements are now wrapped into several columns, making it visually closer to left-centered but not left centered.

You can create an element with a very short name (like 'a') to see what I mean, I hope. It is quite visible in trunk with the default dataset (if debug is set TRUE in BibCite.java). Trunk should work again, I hope I fixed the issues you had with it.

Unmerged revisions

214. By Jens Rauch on 2011-09-05

Fixes 840991

=== modified file 'src/net/geoadel/bibcite/GUI/RelationManager.form'
--- src/net/geoadel/bibcite/GUI/RelationManager.form	2011-09-04 19:39:18 +0000
+++ src/net/geoadel/bibcite/GUI/RelationManager.form	2011-09-05 18:13:28 +0000
@@ -72,8 +72,13 @@
                   </Group>
                   <EmptySpace type="unrelated" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
+<<<<<<< TREE
                       <Component id="jScrollPane1" pref="275" max="32767" attributes="0"/>
                       <Component id="jScrollPane2" alignment="0" pref="275" max="32767" attributes="0"/>
+=======
+                      <Component id="jScrollPane1" pref="271" max="32767" attributes="0"/>
+                      <Component id="jScrollPane2" alignment="0" pref="271" max="32767" attributes="0"/>
+>>>>>>> MERGE-SOURCE
                   </Group>
                   <EmptySpace min="-2" max="-2" attributes="0"/>
               </Group>
@@ -120,6 +125,9 @@
               <Events>
                 <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="lRelatedMouseClicked"/>
               </Events>
+              <AuxValues>
+                <AuxValue name="JavaCodeGenerator_InitCodePre" type="java.lang.String" value="jList2.setLayoutOrientation(javax.swing.JList.VERTICAL_WRAP);"/>
+              </AuxValues>
             </Component>
           </SubComponents>
         </Container>

=== modified file 'src/net/geoadel/bibcite/GUI/RelationManager.java'
--- src/net/geoadel/bibcite/GUI/RelationManager.java	2011-09-04 19:39:18 +0000
+++ src/net/geoadel/bibcite/GUI/RelationManager.java	2011-09-05 18:13:28 +0000
@@ -6,7 +6,7 @@
 
 This file is part of bibcite.
 
-bibcite free software: you can redistribute it and/or modify
+bibcite free software you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
@@ -118,7 +118,12 @@
         });
         jScrollPane1.setViewportView(lNotRelated);
 
+<<<<<<< TREE
         lRelated.setModel(new javax.swing.DefaultListModel() {
+=======
+        jList2.setLayoutOrientation(javax.swing.JList.VERTICAL_WRAP);
+        jList2.setModel(new javax.swing.DefaultListModel() {
+>>>>>>> MERGE-SOURCE
             String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
             public int getSize() { return strings.length; }
             public Object getElementAt(int i) { return strings[i]; }
@@ -159,8 +164,13 @@
                     .addComponent(jLabel2))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+<<<<<<< TREE
                     .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 275, Short.MAX_VALUE)
                     .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 275, Short.MAX_VALUE))
+=======
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 271, Short.MAX_VALUE)
+                    .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 271, Short.MAX_VALUE))
+>>>>>>> MERGE-SOURCE
                 .addContainerGap())
         );