opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8'

Browse Source 
* stable-2.8:
  Fix: File comments overlap in reply pop window
  Fix getting inherited values from PluginConfig
This commit is contained in:
Shawn Pearce
2013-11-29 17:09:25 -08:00
parent 8dfd959750 efcc89d439
commit ef7b219a85
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/LineComment.ui.xml
View File

@@ -29,7 +29,7 @@ limitations under the License.
font-weight: bold; font-weight: bold;
} }
.message { .message {
margin-left: 100px; margin-left: 111px;
} }
</ui:style> </ui:style>

14
gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java
View File

@@ -20,6 +20,7 @@ import com.google.common.collect.Iterables;
import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import java.util.Arrays; import java.util.Arrays;
@@ -55,7 +56,7 @@ public class PluginConfig {
parent.getConfig().getPluginConfig(pluginName) parent.getConfig().getPluginConfig(pluginName)
.withInheritance(projectStateFactory); .withInheritance(projectStateFactory);
Set<String> allNames = cfg.getNames(PLUGIN, pluginName); Set<String> allNames = cfg.getNames(PLUGIN, pluginName);
cfg = new Config(cfg); cfg = copyConfig(cfg);
for (String name : parentPluginConfig.cfg.getNames(PLUGIN, pluginName)) { for (String name : parentPluginConfig.cfg.getNames(PLUGIN, pluginName)) {
if (!allNames.contains(name)) { if (!allNames.contains(name)) {
cfg.setStringList(PLUGIN, pluginName, name, Arrays cfg.setStringList(PLUGIN, pluginName, name, Arrays
@@ -66,6 +67,17 @@ public class PluginConfig {
return this; return this;
} }
private static Config copyConfig(Config cfg) {
Config copiedCfg = new Config();
try {
copiedCfg.fromText(cfg.toText());
} catch (ConfigInvalidException e) {
// cannot happen
throw new IllegalStateException(e);
}
return copiedCfg;
}
public String getString(String name) { public String getString(String name) {
return cfg.getString(PLUGIN, pluginName, name); return cfg.getString(PLUGIN, pluginName, name);
} }