Package org.openstreetmap.josm.gui.conflict.pair

Class AbstractMergePanel.MergeRow

    • Field Summary

      Fields 
      Modifier and Type Field Description
      protected int marginTop  

    • Constructor Summary

      Constructors 
      Constructor Description
      MergeRow()  

    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method Description
      protected void addConstraints​(GBC constraints, int columnIndex)  
      (package private) void addTo​(AbstractMergePanel panel)  
      protected javax.swing.JComponent[] getColumns()  
      protected javax.swing.JComponent merged()  
      protected javax.swing.JComponent mineButton()  
      protected javax.swing.JComponent mineField()  
      protected javax.swing.JComponent rowTitle()  
      protected javax.swing.JComponent theirsButton()  
      protected javax.swing.JComponent theirsField()  

      • Methods inherited from class java.lang.Object

        clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait