| Chunk |
|---|
| Conflicting content |
|---|
}
public void init() {
<<<<<<< HEAD
searchScar.addFocusHandler(new FocusHandler() {
@Override
public void onFocus(FocusEvent arg0) {
searchScar.setValue("");
}
});
searchScar.addBlurHandler(new BlurHandler() {
@Override
public void onBlur(BlurEvent arg0) {
if(searchScar.getValue().isEmpty()) {
searchScar.setValue("Suche...");
}
}
});
=======
searchBox.addFocusHandler(new FocusHandler() {
@Override
public void onFocus(FocusEvent arg0) {
searchBox.setValue("");
}
});
searchBox.addBlurHandler(new BlurHandler() {
@Override
public void onBlur(BlurEvent arg0) {
if(searchBox.getValue().isEmpty()) {
searchBox.setValue("Suche...");
}
}
});
searchBox.addKeyUpHandler(new KeyUpHandler() {
@Override
public void onKeyUp(KeyUpEvent arg0) {
String q = searchBox.getValue();
delegate.performSearch(q);
}
});
>>>>>>> b0eb5f946ea21be44798a5af3e75566d67caafa0
// bugfix to avoid hiding of all panels (maybe there is a better solution...?!)
DOM.setElementAttribute(splitLayoutPanel.getElement(), "style", "position: absolute; left: 0px; top: 0px; right: 5px; bottom: 0px;"); |
| Solution content |
|---|
}
public void init() {
<<<<<<< HEAD
searchScar.addFocusHandler(new FocusHandler() {
@Override
public void onFocus(FocusEvent arg0) {
searchScar.setValue("");
}
});
searchScar.addBlurHandler(new BlurHandler() {
@Override
public void onBlur(BlurEvent arg0) {
if(searchScar.getValue().isEmpty()) {
searchScar.setValue("Suche...");
}
}
});
=======
searchBox.addFocusHandler(new FocusHandler() {
@Override
public void onFocus(FocusEvent arg0) {
searchBox.setValue("");
}
});
searchBox.addBlurHandler(new BlurHandler() {
@Override
public void onBlur(BlurEvent arg0) {
if(searchBox.getValue().isEmpty()) {
searchBox.setValue("Suche...");
}
}
});
searchBox.addKeyUpHandler(new KeyUpHandler() {
@Override
public void onKeyUp(KeyUpEvent arg0) {
String q = searchBox.getValue();
delegate.performSearch(q);
}
});
>>>>>>> b0eb5f946ea21be44798a5af3e75566d67caafa0
// bugfix to avoid hiding of all panels (maybe there is a better solution...?!)
DOM.setElementAttribute(splitLayoutPanel.getElement(), "style", "position: absolute; left: 0px; top: 0px; right: 5px; bottom: 0px;"); |
| File |
|---|
| StandardizedPatientViewImpl.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |