Projects >> pentaho-platform >>eb4acced23d5714595d97d8dfdbcbdd4cc55b29c

Chunk
Conflicting content 
    // show stuff we've created/configured
    contentDeck.showWidget(contentDeck.getWidgetIndex(SolutionBrowserPanel.getInstance()));
    setCheckMMenuItem(browserChecked,workspaceChecked);
<<<<<<< HEAD

    MantleApplication.getInstance().pucToolBarVisibility(true);
  }

  private void showWorkspacePerspective(boolean browserChecked, boolean workspaceChecked) {
=======
    MantleApplication.getInstance().pucToolBarVisibility(true);
  }

  private void showWorkspacePerspective() {
>>>>>>> d6be9721e1a9bf431ea0a3b58cf7923d00846924
   
    GWT.runAsync(new RunAsyncCallback() {
Solution content 
    // show stuff we've created/configured
    contentDeck.showWidget(contentDeck.getWidgetIndex(SolutionBrowserPanel.getInstance()));
    setCheckMMenuItem(browserChecked,workspaceChecked);

    MantleApplication.getInstance().pucToolBarVisibility(true);
  }

  private void showWorkspacePerspective(boolean browserChecked, boolean workspaceChecked) {
   
    GWT.runAsync(new RunAsyncCallback() {
File
PerspectiveManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
        }
        contentDeck.showWidget(contentDeck.getWidgetIndex(WorkspacePanel.getInstance()));
        MantleApplication.getInstance().pucToolBarVisibility(false);   
<<<<<<< HEAD
          
=======
        setCheckMMenuItem(false,true);
>>>>>>> d6be9721e1a9bf431ea0a3b58cf7923d00846924
      }
      
      public void onFailure(Throwable reason) {
Solution content 
        }
        contentDeck.showWidget(contentDeck.getWidgetIndex(WorkspacePanel.getInstance()));
        MantleApplication.getInstance().pucToolBarVisibility(false);   
          
      }
      
      public void onFailure(Throwable reason) {
File
PerspectiveManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
      public void onFailure(Throwable reason) {
      }
    });
<<<<<<< HEAD
    setCheckMMenuItem(browserChecked,workspaceChecked); 
=======
   
>>>>>>> d6be9721e1a9bf431ea0a3b58cf7923d00846924
  }

  private void showAdminPerspective(boolean browserChecked, boolean workspaceChecked) {
Solution content 
      public void onFailure(Throwable reason) {
      }
    });
    setCheckMMenuItem(browserChecked,workspaceChecked); 
  }

  private void showAdminPerspective(boolean browserChecked, boolean workspaceChecked) {
File
PerspectiveManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    MantleXul.getInstance().customizeAdminStyle();
    MantleXul.getInstance().configureAdminCatTree();
    //disable Browser and Workspace menuItem
<<<<<<< HEAD
    setCheckMMenuItem(browserChecked,workspaceChecked);    
    MantleApplication.getInstance().pucToolBarVisibility(false);

=======
    setCheckMMenuItem(browserChecked,workspaceChecked);
    MantleApplication.getInstance().pucToolBarVisibility(false); //this should not be needed since overlay removes.
>>>>>>> d6be9721e1a9bf431ea0a3b58cf7923d00846924
  }

  private void hijackContentArea(IPluginPerspective perspective) {
Solution content 
    MantleXul.getInstance().customizeAdminStyle();
    MantleXul.getInstance().configureAdminCatTree();
    //disable Browser and Workspace menuItem
    setCheckMMenuItem(browserChecked,workspaceChecked);    
    MantleApplication.getInstance().pucToolBarVisibility(false);

  }

  private void hijackContentArea(IPluginPerspective perspective) {
File
PerspectiveManager.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
      this.workspaceMenuItem.setChecked(workspaceChecked);
    }
  }
<<<<<<< HEAD
}
=======
}
>>>>>>> d6be9721e1a9bf431ea0a3b58cf7923d00846924
Solution content 
      this.workspaceMenuItem.setChecked(workspaceChecked);
    }
  }
}
File
PerspectiveManager.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
              model.setShowNavigatorSelected(showNavigator);

<<<<<<< HEAD
             
                try {
               
=======
             // for (Binding b : bindingsToUpdate) {
                try {
                //  b.fireSourceChanged();
>>>>>>> d6be9721e1a9bf431ea0a3b58cf7923d00846924
                  ShowBrowserCommand showBrowserCommand = new ShowBrowserCommand(showNavigator);   
                  showBrowserCommand.execute();  
                } catch (Exception e) {
Solution content 
              model.setShowNavigatorSelected(showNavigator);            
                try {             
                  ShowBrowserCommand showBrowserCommand = new ShowBrowserCommand(showNavigator);   
                  showBrowserCommand.execute();  
                } catch (Exception e) {
File
MantleController.java
Developer's decision
Version 1
Kind of conflict
Comment
Try statement
Chunk
Conflicting content 
                } catch (Exception e) {
                  e.printStackTrace();
                }
<<<<<<< HEAD
           
=======
              //}
>>>>>>> d6be9721e1a9bf431ea0a3b58cf7923d00846924

            } else if (IMantleUserSettingsConstants.MANTLE_SHOW_DESCRIPTIONS_FOR_TOOLTIPS.equals(setting.getName())) {
              boolean checked = "true".equals(setting.getValue()); //$NON-NLS-1$
Solution content 
                } catch (Exception e) {
                  e.printStackTrace();
                }           

            } else if (IMantleUserSettingsConstants.MANTLE_SHOW_DESCRIPTIONS_FOR_TOOLTIPS.equals(setting.getName())) {
              boolean checked = "true".equals(setting.getValue()); //$NON-NLS-1$
File
MantleController.java
Developer's decision
Version 1
Kind of conflict
Comment