Fix merge conflict
This commit is contained in:
		
							parent
							
								
									2da4e4adf6
								
							
						
					
					
						commit
						6a54e97fb4
					
				@ -557,6 +557,22 @@ public abstract class Preferences implements ChangeSource {
 | 
				
			|||||||
		this.putBoolean(SHOW_DISCARD_CONFIRMATION, enabled);
 | 
							this.putBoolean(SHOW_DISCARD_CONFIRMATION, enabled);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						/**
 | 
				
			||||||
 | 
						 * Answer if a confirmation dialog should be shown when canceling a simulation config operation.
 | 
				
			||||||
 | 
						 *
 | 
				
			||||||
 | 
						 * @return true if the confirmation dialog should be shown.
 | 
				
			||||||
 | 
						 */
 | 
				
			||||||
 | 
						public final boolean isShowDiscardSimulationConfirmation() {
 | 
				
			||||||
 | 
							return this.getBoolean(SHOW_DISCARD_SIMULATION_CONFIRMATION, true);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						/**
 | 
				
			||||||
 | 
						 * Enable/Disable showing a confirmation warning when canceling a simulation config operation.
 | 
				
			||||||
 | 
						 */
 | 
				
			||||||
 | 
						public final void setShowDiscardSimulationConfirmation(boolean enabled) {
 | 
				
			||||||
 | 
							this.putBoolean(SHOW_DISCARD_SIMULATION_CONFIRMATION, enabled);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/**
 | 
						/**
 | 
				
			||||||
	 * Answer if the always open leftmost tab is enabled.
 | 
						 * Answer if the always open leftmost tab is enabled.
 | 
				
			||||||
	 *
 | 
						 *
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user